diff --git a/.eslintrc.json b/.eslintrc.json index 2952d687d..867e5a0fb 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -24,10 +24,7 @@ "rules": { "no-unused-vars": 1, "react/react-in-jsx-scope": "off", - "react/no-unknown-property": [ - "error", - { "ignore": ["chatcheckout", "css"] } - ] + "react/no-unknown-property": ["error", { "ignore": ["css"] }] }, "overrides": [ { diff --git a/.prettierrc.json b/.prettierrc.json index 36a276f06..018d593fd 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -12,8 +12,10 @@ "requirePragma": false, "semi": true, "singleQuote": false, + "plugins": ["@trivago/prettier-plugin-sort-imports"], "importOrder": [ "", + "^types/", "^hooks/", "^components/|^pages/", "^[./]", diff --git a/craco.config.js b/craco.config.js index a55b0fef5..b5114e18e 100644 --- a/craco.config.js +++ b/craco.config.js @@ -1,16 +1,4 @@ -const CracoAlias = require("craco-alias"); - module.exports = { - plugins: [ - { - plugin: CracoAlias, - options: { - baseUrl: "./src", - source: "tsconfig", - tsConfigPath: "./tsconfig.paths.json", - }, - }, - ], babel: { presets: [ [ diff --git a/package.json b/package.json index 86bb15391..289a1eef7 100644 --- a/package.json +++ b/package.json @@ -10,15 +10,12 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@material-ui/icons": "^4.11.2", - "@mui/icons-material": "^5.3.1", + "@mui/icons-material": "^5.14.1", "@mui/material": "^5.4.1", "@svgr/webpack": "5.5.0", - "@types/qs": "^6.9.7", - "@types/react": "^17.0.0", "antd": "^5.4.6", "axios": "^0.21.1", "browser-image-compression": "^2.0.0", - "craco-alias": "^3.0.1", "cross-env": "^7.0.3", "dayjs": "^1.11.7", "dotenv": "^16.0.0", @@ -29,13 +26,13 @@ "moment": "^2.29.3", "prop-types": "^15.8.1", "qs": "^6.11.0", - "react": "^17.0.1", + "react": "^18.2.0", "react-cookie": "^4.1.1", - "react-dom": "^17.0.1", + "react-dom": "^18.2.0", "react-ga4": "^1.4.1", "react-i18next": "^12.0.0", "react-qr-code": "^2.0.11", - "react-router-dom": "^5.2.0", + "react-router-dom": "^5.3.3", "recoil": "^0.7.5", "socket.io-client": "^4.3.2", "use-state-with-callback": "^3.0.2" @@ -67,11 +64,13 @@ "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^4.1.1", "@types/craco__craco": "^6.4.0", + "@types/qs": "^6.9.7", + "@types/react": "^18.2.15", + "@types/react-dom": "^18.2.7", + "@types/react-router-dom": "^5.3.3", "@types/eslint": "^8.44.0", "@types/eslint-config-prettier": "^6.11.0", "@types/prop-types": "^15.7.5", - "@types/react-dom": "^17.0.20", - "@types/react-router-dom": "^5.3.3", "@typescript-eslint/eslint-plugin": "^5.37.0", "@typescript-eslint/parser": "^5.37.0", "cypress": "^10.3.1", @@ -84,6 +83,9 @@ "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.26.1", "eslint-plugin-react-hooks": "^4.2.0", - "typescript": "^4.7.4" + "typescript": "^5.1.6" + }, + "resolutions": { + "@types/react": "^17.0.2" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0bffdf396..0212b74fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,13 +4,16 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + '@types/react': ^17.0.2 + dependencies: '@babel/preset-react': specifier: 7.12.5 version: 7.12.5(@babel/core@7.21.3) '@craco/craco': specifier: ^6.4.3 - version: 6.4.5(@types/node@18.15.10)(react-scripts@4.0.3)(typescript@4.9.5) + version: 6.4.5(@types/node@18.15.10)(react-scripts@4.0.3)(typescript@5.1.6) '@emotion/babel-plugin': specifier: ^11.10.6 version: 11.10.6 @@ -19,40 +22,31 @@ dependencies: version: 11.10.6 '@emotion/react': specifier: ^11.10.6 - version: 11.10.6(@types/react@17.0.0)(react@17.0.2) + version: 11.10.6(@types/react@17.0.2)(react@18.2.0) '@emotion/styled': specifier: ^11.10.6 - version: 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.0)(react@17.0.2) + version: 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.2)(react@18.2.0) '@material-ui/icons': specifier: ^4.11.2 - version: 4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) + version: 4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) '@mui/icons-material': - specifier: ^5.3.1 - version: 5.11.11(@mui/material@5.11.15)(@types/react@17.0.0)(react@17.0.2) + specifier: ^5.14.1 + version: 5.14.1(@mui/material@5.11.15)(@types/react@17.0.2)(react@18.2.0) '@mui/material': specifier: ^5.4.1 - version: 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) + version: 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) '@svgr/webpack': specifier: 5.5.0 version: 5.5.0 - '@types/qs': - specifier: ^6.9.7 - version: 6.9.7 - '@types/react': - specifier: ^17.0.0 - version: 17.0.0 antd: specifier: ^5.4.6 - version: 5.4.6(moment@2.29.4)(react-dom@17.0.2)(react@17.0.2) + version: 5.4.6(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0) axios: specifier: ^0.21.1 version: 0.21.4 browser-image-compression: specifier: ^2.0.0 version: 2.0.2 - craco-alias: - specifier: ^3.0.1 - version: 3.0.1 cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -84,35 +78,35 @@ dependencies: specifier: ^6.11.0 version: 6.11.0 react: - specifier: ^17.0.1 - version: 17.0.2 + specifier: ^18.2.0 + version: 18.2.0 react-cookie: specifier: ^4.1.1 - version: 4.1.1(react@17.0.2) + version: 4.1.1(react@18.2.0) react-dom: - specifier: ^17.0.1 - version: 17.0.2(react@17.0.2) + specifier: ^18.2.0 + version: 18.2.0(react@18.2.0) react-ga4: specifier: ^1.4.1 version: 1.4.1 react-i18next: specifier: ^12.0.0 - version: 12.2.0(i18next@22.4.13)(react-dom@17.0.2)(react@17.0.2) + version: 12.2.0(i18next@22.4.13)(react-dom@18.2.0)(react@18.2.0) react-qr-code: specifier: ^2.0.11 - version: 2.0.11(react@17.0.2) + version: 2.0.11(react@18.2.0) react-router-dom: - specifier: ^5.2.0 - version: 5.3.4(react@17.0.2) + specifier: ^5.3.3 + version: 5.3.4(react@18.2.0) recoil: specifier: ^0.7.5 - version: 0.7.7(react-dom@17.0.2)(react@17.0.2) + version: 0.7.7(react-dom@18.2.0)(react@18.2.0) socket.io-client: specifier: ^4.3.2 version: 4.6.1 use-state-with-callback: specifier: ^3.0.2 - version: 3.0.2(react-dom@17.0.2)(react@17.0.2) + version: 3.0.2(react-dom@18.2.0)(react@18.2.0) devDependencies: '@trivago/prettier-plugin-sort-imports': @@ -130,18 +124,24 @@ devDependencies: '@types/prop-types': specifier: ^15.7.5 version: 15.7.5 + '@types/qs': + specifier: ^6.9.7 + version: 6.9.7 + '@types/react': + specifier: ^17.0.2 + version: 17.0.2 '@types/react-dom': - specifier: ^17.0.20 - version: 17.0.20 + specifier: ^18.2.7 + version: 18.2.7 '@types/react-router-dom': specifier: ^5.3.3 version: 5.3.3 '@typescript-eslint/eslint-plugin': specifier: ^5.37.0 - version: 5.57.0(@typescript-eslint/parser@5.57.0)(eslint@7.32.0)(typescript@4.9.5) + version: 5.57.0(@typescript-eslint/parser@5.57.0)(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/parser': specifier: ^5.37.0 - version: 5.57.0(eslint@7.32.0)(typescript@4.9.5) + version: 5.57.0(eslint@7.32.0)(typescript@5.1.6) cypress: specifier: ^10.3.1 version: 10.11.0 @@ -173,8 +173,8 @@ devDependencies: specifier: ^4.2.0 version: 4.6.0(eslint@7.32.0) typescript: - specifier: ^4.7.4 - version: 4.9.5 + specifier: ^5.1.6 + version: 5.1.6 packages: @@ -192,7 +192,7 @@ packages: '@ctrl/tinycolor': 3.6.0 dev: false - /@ant-design/cssinjs@1.9.1(react-dom@17.0.2)(react@17.0.2): + /@ant-design/cssinjs@1.9.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-CZt1vCMs/sY7RoacYuIkZwQmb8Bhp99ReNNE9Y8lnUzik8fmCdKAQA7ecvVOFwmNFdcBHga7ye/XIRrsbkiqWw==} peerDependencies: react: '>=16.0.0' @@ -203,9 +203,9 @@ packages: '@emotion/unitless': 0.7.5 classnames: 2.3.2 csstype: 3.1.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) stylis: 4.1.3 dev: false @@ -213,7 +213,7 @@ packages: resolution: {integrity: sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==} dev: false - /@ant-design/icons@5.0.1(react-dom@17.0.2)(react@17.0.2): + /@ant-design/icons@5.0.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-ZyF4ksXCcdtwA/1PLlnFLcF/q8/MhwxXhKHh4oCHDA4Ip+ZzAHoICtyp4wZWfiCVDP0yuz3HsjyvuldHFb3wjA==} engines: {node: '>=8'} peerDependencies: @@ -224,12 +224,12 @@ packages: '@ant-design/icons-svg': 4.2.1 '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@ant-design/react-slick@1.0.0(react@17.0.2): + /@ant-design/react-slick@1.0.0(react@18.2.0): resolution: {integrity: sha512-OKxZsn8TAf8fYxP79rDXgLs9zvKMTslK6dJ4iLhDXOujUqC5zJPBRszyrcEHXcMPOm1Sgk40JgyF3yiL/Swd7w==} peerDependencies: react: '>=16.9.0' @@ -237,7 +237,7 @@ packages: '@babel/runtime': 7.21.0 classnames: 2.3.2 json2mq: 0.2.0 - react: 17.0.2 + react: 18.2.0 resize-observer-polyfill: 1.5.1 throttle-debounce: 5.0.0 dev: false @@ -1735,6 +1735,13 @@ packages: dependencies: regenerator-runtime: 0.13.11 + /@babel/runtime@7.22.6: + resolution: {integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.13.11 + dev: false + /@babel/template@7.20.7: resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} engines: {node: '>=6.9.0'} @@ -1815,7 +1822,7 @@ packages: dev: true optional: true - /@craco/craco@6.4.5(@types/node@18.15.10)(react-scripts@4.0.3)(typescript@4.9.5): + /@craco/craco@6.4.5(@types/node@18.15.10)(react-scripts@4.0.3)(typescript@5.1.6): resolution: {integrity: sha512-8F2rIAao8sEh0FPP52ViEvDM9GjJ7acq0knu1c8UgI+EuZMD5/ZB270ol6jV4iNY7it9Umg/RoGBvNRUNr8U8w==} engines: {node: '>=6'} hasBin: true @@ -1823,10 +1830,10 @@ packages: react-scripts: ^4.0.0 dependencies: cosmiconfig: 7.1.0 - cosmiconfig-typescript-loader: 1.0.9(@types/node@18.15.10)(cosmiconfig@7.1.0)(typescript@4.9.5) + cosmiconfig-typescript-loader: 1.0.9(@types/node@18.15.10)(cosmiconfig@7.1.0)(typescript@5.1.6) cross-spawn: 7.0.3 lodash: 4.17.21 - react-scripts: 4.0.3(eslint@7.32.0)(react@17.0.2)(typescript@4.9.5) + react-scripts: 4.0.3(eslint@7.32.0)(react@18.2.0)(typescript@5.1.6) semver: 7.3.8 webpack-merge: 4.2.2 transitivePeerDependencies: @@ -1968,7 +1975,7 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: false - /@emotion/react@11.10.6(@types/react@17.0.0)(react@17.0.2): + /@emotion/react@11.10.6(@types/react@17.0.2)(react@18.2.0): resolution: {integrity: sha512-6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw==} peerDependencies: '@types/react': '*' @@ -1981,12 +1988,12 @@ packages: '@emotion/babel-plugin': 11.11.0 '@emotion/cache': 11.10.5 '@emotion/serialize': 1.1.1 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2) + '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0) '@emotion/utils': 1.2.0 '@emotion/weak-memoize': 0.3.0 - '@types/react': 17.0.0 + '@types/react': 17.0.2 hoist-non-react-statics: 3.3.2 - react: 17.0.2 + react: 18.2.0 dev: false /@emotion/serialize@1.1.1: @@ -2013,7 +2020,7 @@ packages: resolution: {integrity: sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==} dev: false - /@emotion/styled@11.10.6(@emotion/react@11.10.6)(@types/react@17.0.0)(react@17.0.2): + /@emotion/styled@11.10.6(@emotion/react@11.10.6)(@types/react@17.0.2)(react@18.2.0): resolution: {integrity: sha512-OXtBzOmDSJo5Q0AFemHCfl+bUueT8BIcPSxu0EGTpGk6DmI5dnhSzQANm1e1ze0YZL7TDyAyy6s/b/zmGOS3Og==} peerDependencies: '@emotion/react': ^11.0.0-rc.0 @@ -2026,12 +2033,12 @@ packages: '@babel/runtime': 7.21.0 '@emotion/babel-plugin': 11.11.0 '@emotion/is-prop-valid': 1.2.0 - '@emotion/react': 11.10.6(@types/react@17.0.0)(react@17.0.2) + '@emotion/react': 11.10.6(@types/react@17.0.2)(react@18.2.0) '@emotion/serialize': 1.1.1 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2) + '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0) '@emotion/utils': 1.2.0 - '@types/react': 17.0.0 - react: 17.0.2 + '@types/react': 17.0.2 + react: 18.2.0 dev: false /@emotion/unitless@0.7.5: @@ -2046,12 +2053,12 @@ packages: resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} dev: false - /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@17.0.2): + /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@18.2.0): resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==} peerDependencies: react: '>=16.8.0' dependencies: - react: 17.0.2 + react: 18.2.0 dev: false /@emotion/utils@1.2.0: @@ -2888,7 +2895,7 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 dev: false - /@material-ui/core@4.12.4(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@material-ui/core@4.12.4(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==} engines: {node: '>=8.0.0'} deprecated: Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5. @@ -2901,23 +2908,23 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@material-ui/styles': 4.11.5(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) - '@material-ui/system': 4.12.2(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) - '@material-ui/types': 5.1.0(@types/react@17.0.0) - '@material-ui/utils': 4.11.3(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.0 + '@material-ui/styles': 4.11.5(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) + '@material-ui/system': 4.12.2(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) + '@material-ui/types': 5.1.0(@types/react@17.0.2) + '@material-ui/utils': 4.11.3(react-dom@18.2.0)(react@18.2.0) + '@types/react': 17.0.2 '@types/react-transition-group': 4.4.5 clsx: 1.2.1 hoist-non-react-statics: 3.3.2 popper.js: 1.16.1-lts prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) react-is: 17.0.2 - react-transition-group: 4.4.5(react-dom@17.0.2)(react@17.0.2) + react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@material-ui/icons@4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@material-ui/icons@4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==} engines: {node: '>=8.0.0'} peerDependencies: @@ -2930,13 +2937,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@material-ui/core': 4.12.4(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.0 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + '@material-ui/core': 4.12.4(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 17.0.2 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@material-ui/styles@4.11.5(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@material-ui/styles@4.11.5(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==} engines: {node: '>=8.0.0'} deprecated: Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5. @@ -2950,9 +2957,9 @@ packages: dependencies: '@babel/runtime': 7.21.0 '@emotion/hash': 0.8.0 - '@material-ui/types': 5.1.0(@types/react@17.0.0) - '@material-ui/utils': 4.11.3(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.0 + '@material-ui/types': 5.1.0(@types/react@17.0.2) + '@material-ui/utils': 4.11.3(react-dom@18.2.0)(react@18.2.0) + '@types/react': 17.0.2 clsx: 1.2.1 csstype: 2.6.21 hoist-non-react-statics: 3.3.2 @@ -2965,11 +2972,11 @@ packages: jss-plugin-rule-value-function: 10.10.0 jss-plugin-vendor-prefixer: 10.10.0 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@material-ui/system@4.12.2(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@material-ui/system@4.12.2(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==} engines: {node: '>=8.0.0'} peerDependencies: @@ -2981,15 +2988,15 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@material-ui/utils': 4.11.3(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.0 + '@material-ui/utils': 4.11.3(react-dom@18.2.0)(react@18.2.0) + '@types/react': 17.0.2 csstype: 2.6.21 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@material-ui/types@5.1.0(@types/react@17.0.0): + /@material-ui/types@5.1.0(@types/react@17.0.2): resolution: {integrity: sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==} peerDependencies: '@types/react': '*' @@ -2997,10 +3004,10 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.0 + '@types/react': 17.0.2 dev: false - /@material-ui/utils@4.11.3(react-dom@17.0.2)(react@17.0.2): + /@material-ui/utils@4.11.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==} engines: {node: '>=8.0.0'} peerDependencies: @@ -3009,12 +3016,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) react-is: 17.0.2 dev: false - /@mui/base@5.0.0-alpha.123(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@mui/base@5.0.0-alpha.123(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-pxzcAfET3I6jvWqS4kijiLMn1OmdMw+mGmDa0SqmDZo3bXXdvLhpCCPqCkULG3UykhvFCOcU5HclOX3JCA+Zhg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3027,14 +3034,14 @@ packages: dependencies: '@babel/runtime': 7.21.0 '@emotion/is-prop-valid': 1.2.0 - '@mui/types': 7.2.3(@types/react@17.0.0) - '@mui/utils': 5.11.13(react@17.0.2) + '@mui/types': 7.2.3(@types/react@17.0.2) + '@mui/utils': 5.11.13(react@18.2.0) '@popperjs/core': 2.11.7 - '@types/react': 17.0.0 + '@types/react': 17.0.2 clsx: 1.2.1 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 dev: false @@ -3042,8 +3049,8 @@ packages: resolution: {integrity: sha512-Q0e2oBsjHyIWWj1wLzl14btunvBYC0yl+px7zL9R69tF87uenj6q72ieS369BJ6jxYpJwvXfR6/f+TC+ZUsKKg==} dev: false - /@mui/icons-material@5.11.11(@mui/material@5.11.15)(@types/react@17.0.0)(react@17.0.2): - resolution: {integrity: sha512-Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw==} + /@mui/icons-material@5.14.1(@mui/material@5.11.15)(@types/react@17.0.2)(react@18.2.0): + resolution: {integrity: sha512-xV/f26muQqtWzerzOIdGPrXoxp/OKaE2G2Wp9gnmG47mHua5Slup/tMc3fA4ZYUreGGrK6+tT81TEvt1Wsng8Q==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 @@ -3053,13 +3060,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.21.0 - '@mui/material': 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.0 - react: 17.0.2 + '@babel/runtime': 7.22.6 + '@mui/material': 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 17.0.2 + react: 18.2.0 dev: false - /@mui/material@5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2): + /@mui/material@5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-E5RbLq9/OvRKmGyeZawdnmFBCvhKkI/Zqgr0xFqW27TGwKLxObq/BreJc6Uu5Sbv8Fjj34vEAbRx6otfOyxn5w==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3077,25 +3084,25 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@emotion/react': 11.10.6(@types/react@17.0.0)(react@17.0.2) - '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.0)(react@17.0.2) - '@mui/base': 5.0.0-alpha.123(@types/react@17.0.0)(react-dom@17.0.2)(react@17.0.2) + '@emotion/react': 11.10.6(@types/react@17.0.2)(react@18.2.0) + '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.2)(react@18.2.0) + '@mui/base': 5.0.0-alpha.123(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) '@mui/core-downloads-tracker': 5.11.15 - '@mui/system': 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.0)(react@17.0.2) - '@mui/types': 7.2.3(@types/react@17.0.0) - '@mui/utils': 5.11.13(react@17.0.2) - '@types/react': 17.0.0 + '@mui/system': 5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.2)(react@18.2.0) + '@mui/types': 7.2.3(@types/react@17.0.2) + '@mui/utils': 5.11.13(react@18.2.0) + '@types/react': 17.0.2 '@types/react-transition-group': 4.4.5 clsx: 1.2.1 csstype: 3.1.2 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 - react-transition-group: 4.4.5(react-dom@17.0.2)(react@17.0.2) + react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.11.13(@types/react@17.0.0)(react@17.0.2): + /@mui/private-theming@5.11.13(@types/react@17.0.2)(react@18.2.0): resolution: {integrity: sha512-PJnYNKzW5LIx3R+Zsp6WZVPs6w5sEKJ7mgLNnUXuYB1zo5aX71FVLtV7geyPXRcaN2tsoRNK7h444ED0t7cIjA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3106,13 +3113,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@mui/utils': 5.11.13(react@17.0.2) - '@types/react': 17.0.0 + '@mui/utils': 5.11.13(react@18.2.0) + '@types/react': 17.0.2 prop-types: 15.8.1 - react: 17.0.2 + react: 18.2.0 dev: false - /@mui/styled-engine@5.11.11(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(react@17.0.2): + /@mui/styled-engine@5.11.11(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(react@18.2.0): resolution: {integrity: sha512-wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3127,14 +3134,14 @@ packages: dependencies: '@babel/runtime': 7.21.0 '@emotion/cache': 11.10.5 - '@emotion/react': 11.10.6(@types/react@17.0.0)(react@17.0.2) - '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.0)(react@17.0.2) + '@emotion/react': 11.10.6(@types/react@17.0.2)(react@18.2.0) + '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.2)(react@18.2.0) csstype: 3.1.2 prop-types: 15.8.1 - react: 17.0.2 + react: 18.2.0 dev: false - /@mui/system@5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.0)(react@17.0.2): + /@mui/system@5.11.15(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(@types/react@17.0.2)(react@18.2.0): resolution: {integrity: sha512-vCatoWCTnAPquoNifHbqMCMnOElEbLosVUeW0FQDyjCq+8yMABD9E6iY0s14O7iq1wD+qqU7rFAuDIVvJ/AzzA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3151,20 +3158,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@emotion/react': 11.10.6(@types/react@17.0.0)(react@17.0.2) - '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.0)(react@17.0.2) - '@mui/private-theming': 5.11.13(@types/react@17.0.0)(react@17.0.2) - '@mui/styled-engine': 5.11.11(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(react@17.0.2) - '@mui/types': 7.2.3(@types/react@17.0.0) - '@mui/utils': 5.11.13(react@17.0.2) - '@types/react': 17.0.0 + '@emotion/react': 11.10.6(@types/react@17.0.2)(react@18.2.0) + '@emotion/styled': 11.10.6(@emotion/react@11.10.6)(@types/react@17.0.2)(react@18.2.0) + '@mui/private-theming': 5.11.13(@types/react@17.0.2)(react@18.2.0) + '@mui/styled-engine': 5.11.11(@emotion/react@11.10.6)(@emotion/styled@11.10.6)(react@18.2.0) + '@mui/types': 7.2.3(@types/react@17.0.2) + '@mui/utils': 5.11.13(react@18.2.0) + '@types/react': 17.0.2 clsx: 1.2.1 csstype: 3.1.2 prop-types: 15.8.1 - react: 17.0.2 + react: 18.2.0 dev: false - /@mui/types@7.2.3(@types/react@17.0.0): + /@mui/types@7.2.3(@types/react@17.0.2): resolution: {integrity: sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==} peerDependencies: '@types/react': '*' @@ -3172,10 +3179,10 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.0 + '@types/react': 17.0.2 dev: false - /@mui/utils@5.11.13(react@17.0.2): + /@mui/utils@5.11.13(react@18.2.0): resolution: {integrity: sha512-5ltA58MM9euOuUcnvwFJqpLdEugc9XFsRR8Gt4zZNb31XzMfSKJPR4eumulyhsOTK1rWf7K4D63NKFPfX0AxqA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3185,7 +3192,7 @@ packages: '@types/prop-types': 15.7.5 '@types/react-is': 17.0.3 prop-types: 15.8.1 - react: 17.0.2 + react: 18.2.0 react-is: 18.2.0 dev: false @@ -3307,16 +3314,16 @@ packages: resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} dev: false - /@rc-component/context@1.3.0(react-dom@17.0.2)(react@17.0.2): + /@rc-component/context@1.3.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-6QdaCJ7Wn5UZLJs15IEfqy4Ru3OaL5ctqpQYWd5rlfV9wwzrzdt6+kgAQZV/qdB0MUPN4nhyBfRembQCIvBf+w==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /@rc-component/mini-decimal@1.0.1: @@ -3326,7 +3333,7 @@ packages: '@babel/runtime': 7.21.0 dev: false - /@rc-component/mutate-observer@1.0.0(react-dom@17.0.2)(react@17.0.2): + /@rc-component/mutate-observer@1.0.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-okqRJSfNisXdI6CUeOLZC5ukBW/8kir2Ii4PJiKpUt+3+uS7dxwJUMxsUZquxA1rQuL8YcEmKVp/TCnR+yUdZA==} engines: {node: '>=8.x'} peerDependencies: @@ -3335,12 +3342,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@rc-component/portal@1.1.1(react-dom@17.0.2)(react@17.0.2): + /@rc-component/portal@1.1.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-m8w3dFXX0H6UkJ4wtfrSwhe2/6M08uz24HHrF8pWfAXPwA9hwCuTE5per/C86KwNLouRpwFGcr7LfpHaa1F38g==} engines: {node: '>=8.x'} peerDependencies: @@ -3349,12 +3356,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@rc-component/tour@1.8.0(react-dom@17.0.2)(react@17.0.2): + /@rc-component/tour@1.8.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-rrRGioHTLQlGca27G2+lw7QpRb3uuMYCUIJjj31/B44VCJS0P2tqYhOgtzvWQmaLMlWH3ZlpzotkKX13NT4XEA==} engines: {node: '>=8.x'} peerDependencies: @@ -3362,15 +3369,15 @@ packages: react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/portal': 1.1.1(react-dom@17.0.2)(react@17.0.2) - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /@rc-component/trigger@1.10.0(react-dom@17.0.2)(react@17.0.2): + /@rc-component/trigger@1.10.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kDnsBBUIX+oCk1nhZ8vwCFiq15sIXqvYlRLTnSWXDTgec8SRjHxIA2T47FbWVlZ9PtlT1NIVWH8q3GbiSRKWUA==} engines: {node: '>=8.x'} peerDependencies: @@ -3378,14 +3385,14 @@ packages: react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/portal': 1.1.1(react-dom@17.0.2)(react@17.0.2) + '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-align: 4.0.15(react-dom@17.0.2)(react@17.0.2) - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-align: 4.0.15(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /@rollup/plugin-node-resolve@7.1.3(rollup@1.32.1): @@ -3779,7 +3786,7 @@ packages: /@types/hoist-non-react-statics@3.3.1: resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} dependencies: - '@types/react': 18.2.14 + '@types/react': 17.0.2 hoist-non-react-statics: 3.3.2 dev: false @@ -3860,28 +3867,29 @@ packages: /@types/qs@6.9.7: resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} + dev: true /@types/range-parser@1.2.4: resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} dev: true - /@types/react-dom@17.0.20: - resolution: {integrity: sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==} + /@types/react-dom@18.2.7: + resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} dependencies: - '@types/react': 17.0.0 + '@types/react': 17.0.2 dev: true /@types/react-is@17.0.3: resolution: {integrity: sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==} dependencies: - '@types/react': 18.2.14 + '@types/react': 17.0.2 dev: false /@types/react-router-dom@5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.14 + '@types/react': 17.0.2 '@types/react-router': 5.1.20 dev: true @@ -3889,26 +3897,19 @@ packages: resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.2.14 + '@types/react': 17.0.2 dev: true /@types/react-transition-group@4.4.5: resolution: {integrity: sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==} dependencies: - '@types/react': 18.2.14 + '@types/react': 17.0.2 dev: false - /@types/react@17.0.0: - resolution: {integrity: sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==} - dependencies: - '@types/prop-types': 15.7.5 - csstype: 3.1.2 - - /@types/react@18.2.14: - resolution: {integrity: sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g==} + /@types/react@17.0.2: + resolution: {integrity: sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==} dependencies: '@types/prop-types': 15.7.5 - '@types/scheduler': 0.16.3 csstype: 3.1.2 /@types/resolve@0.0.8: @@ -3917,9 +3918,6 @@ packages: '@types/node': 18.15.10 dev: false - /@types/scheduler@0.16.3: - resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} - /@types/semver@7.3.13: resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==} dev: true @@ -4014,7 +4012,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin@4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/eslint-plugin@4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4025,8 +4023,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@4.9.5) - '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 4.33.0 debug: 4.3.4(supports-color@6.1.0) eslint: 7.32.0 @@ -4034,13 +4032,13 @@ packages: ignore: 5.2.4 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/eslint-plugin@5.57.0(@typescript-eslint/parser@5.57.0)(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/eslint-plugin@5.57.0(@typescript-eslint/parser@5.57.0)(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-itag0qpN6q2UMM6Xgk6xoHa0D0/P+M17THnr4SVgqn9Rgam5k/He33MA7/D7QoJcdMxHFyX7U9imaBonAX/6qA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4052,23 +4050,23 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.4.1 - '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 5.57.0 - '@typescript-eslint/type-utils': 5.57.0(eslint@7.32.0)(typescript@4.9.5) - '@typescript-eslint/utils': 5.57.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/type-utils': 5.57.0(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.57.0(eslint@7.32.0)(typescript@5.1.6) debug: 4.3.4(supports-color@6.1.0) eslint: 7.32.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 semver: 7.3.8 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils@3.10.1(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/experimental-utils@3.10.1(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4076,7 +4074,7 @@ packages: dependencies: '@types/json-schema': 7.0.11 '@typescript-eslint/types': 3.10.1 - '@typescript-eslint/typescript-estree': 3.10.1(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 3.10.1(typescript@5.1.6) eslint: 7.32.0 eslint-scope: 5.1.1 eslint-utils: 2.1.0 @@ -4085,7 +4083,7 @@ packages: - typescript dev: false - /@typescript-eslint/experimental-utils@4.33.0(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/experimental-utils@4.33.0(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4094,7 +4092,7 @@ packages: '@types/json-schema': 7.0.11 '@typescript-eslint/scope-manager': 4.33.0 '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 4.33.0(typescript@5.1.6) eslint: 7.32.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@7.32.0) @@ -4103,7 +4101,7 @@ packages: - typescript dev: false - /@typescript-eslint/parser@4.33.0(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/parser@4.33.0(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4115,15 +4113,15 @@ packages: dependencies: '@typescript-eslint/scope-manager': 4.33.0 '@typescript-eslint/types': 4.33.0 - '@typescript-eslint/typescript-estree': 4.33.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 4.33.0(typescript@5.1.6) debug: 4.3.4(supports-color@6.1.0) eslint: 7.32.0 - typescript: 4.9.5 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/parser@5.57.0(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/parser@5.57.0(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-orrduvpWYkgLCyAdNtR1QIWovcNZlEm6yL8nwH/eTxWLd8gsP+25pdLHYzL2QdkqrieaDwLpytHqycncv0woUQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4135,10 +4133,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.57.0 '@typescript-eslint/types': 5.57.0 - '@typescript-eslint/typescript-estree': 5.57.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 5.57.0(typescript@5.1.6) debug: 4.3.4(supports-color@6.1.0) eslint: 7.32.0 - typescript: 4.9.5 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -4159,7 +4157,7 @@ packages: '@typescript-eslint/visitor-keys': 5.57.0 dev: true - /@typescript-eslint/type-utils@5.57.0(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/type-utils@5.57.0(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-kxXoq9zOTbvqzLbdNKy1yFrxLC6GDJFE2Yuo3KqSwTmDOFjUGeWSakgoXT864WcK5/NAJkkONCiKb1ddsqhLXQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4169,12 +4167,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.57.0(typescript@4.9.5) - '@typescript-eslint/utils': 5.57.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 5.57.0(typescript@5.1.6) + '@typescript-eslint/utils': 5.57.0(eslint@7.32.0)(typescript@5.1.6) debug: 4.3.4(supports-color@6.1.0) eslint: 7.32.0 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -4194,7 +4192,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@3.10.1(typescript@4.9.5): + /@typescript-eslint/typescript-estree@3.10.1(typescript@5.1.6): resolution: {integrity: sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4210,13 +4208,13 @@ packages: is-glob: 4.0.3 lodash: 4.17.21 semver: 7.3.8 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/typescript-estree@4.33.0(typescript@4.9.5): + /@typescript-eslint/typescript-estree@4.33.0(typescript@5.1.6): resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -4231,13 +4229,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/typescript-estree@5.57.0(typescript@4.9.5): + /@typescript-eslint/typescript-estree@5.57.0(typescript@5.1.6): resolution: {integrity: sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4252,13 +4250,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.57.0(eslint@7.32.0)(typescript@4.9.5): + /@typescript-eslint/utils@5.57.0(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4269,7 +4267,7 @@ packages: '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.57.0 '@typescript-eslint/types': 5.57.0 - '@typescript-eslint/typescript-estree': 5.57.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 5.57.0(typescript@5.1.6) eslint: 7.32.0 eslint-scope: 5.1.1 semver: 7.3.8 @@ -4601,59 +4599,59 @@ packages: dependencies: color-convert: 2.0.1 - /antd@5.4.6(moment@2.29.4)(react-dom@17.0.2)(react@17.0.2): + /antd@5.4.6(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-va8fmtigdSoyO5BTrOQXRI2N22rWqtmd6FNGPlU4xV2S7Bi13/IJvm0BxO+WaNAVrcZuKIruZ+1EI3UHU80/vw==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@ant-design/colors': 7.0.0 - '@ant-design/cssinjs': 1.9.1(react-dom@17.0.2)(react@17.0.2) - '@ant-design/icons': 5.0.1(react-dom@17.0.2)(react@17.0.2) - '@ant-design/react-slick': 1.0.0(react@17.0.2) + '@ant-design/cssinjs': 1.9.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.0.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/react-slick': 1.0.0(react@18.2.0) '@babel/runtime': 7.21.0 '@ctrl/tinycolor': 3.6.0 - '@rc-component/mutate-observer': 1.0.0(react-dom@17.0.2)(react@17.0.2) - '@rc-component/tour': 1.8.0(react-dom@17.0.2)(react@17.0.2) - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/mutate-observer': 1.0.0(react-dom@18.2.0)(react@18.2.0) + '@rc-component/tour': 1.8.0(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 copy-to-clipboard: 3.3.3 dayjs: 1.11.7 - qrcode.react: 3.1.0(react@17.0.2) - rc-cascader: 3.10.3(react-dom@17.0.2)(react@17.0.2) - rc-checkbox: 3.0.0(react-dom@17.0.2)(react@17.0.2) - rc-collapse: 3.5.2(react-dom@17.0.2)(react@17.0.2) - rc-dialog: 9.1.0(react-dom@17.0.2)(react@17.0.2) - rc-drawer: 6.1.5(react-dom@17.0.2)(react@17.0.2) - rc-dropdown: 4.0.1(react-dom@17.0.2)(react@17.0.2) - rc-field-form: 1.30.0(react-dom@17.0.2)(react@17.0.2) - rc-image: 5.16.0(react-dom@17.0.2)(react@17.0.2) - rc-input: 1.0.4(react-dom@17.0.2)(react@17.0.2) - rc-input-number: 7.4.2(react-dom@17.0.2)(react@17.0.2) - rc-mentions: 2.2.0(react-dom@17.0.2)(react@17.0.2) - rc-menu: 9.8.4(react-dom@17.0.2)(react@17.0.2) - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-notification: 5.0.3(react-dom@17.0.2)(react@17.0.2) - rc-pagination: 3.3.1(react-dom@17.0.2)(react@17.0.2) - rc-picker: 3.6.2(dayjs@1.11.7)(moment@2.29.4)(react-dom@17.0.2)(react@17.0.2) - rc-progress: 3.4.1(react-dom@17.0.2)(react@17.0.2) - rc-rate: 2.10.0(react-dom@17.0.2)(react@17.0.2) - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-segmented: 2.1.2(react-dom@17.0.2)(react@17.0.2) - rc-select: 14.4.3(react-dom@17.0.2)(react@17.0.2) - rc-slider: 10.1.1(react-dom@17.0.2)(react@17.0.2) - rc-steps: 6.0.0(react-dom@17.0.2)(react@17.0.2) - rc-switch: 4.1.0(react-dom@17.0.2)(react@17.0.2) - rc-table: 7.31.1(react-dom@17.0.2)(react@17.0.2) - rc-tabs: 12.5.10(react-dom@17.0.2)(react@17.0.2) - rc-textarea: 1.2.2(react-dom@17.0.2)(react@17.0.2) - rc-tooltip: 6.0.1(react-dom@17.0.2)(react@17.0.2) - rc-tree: 5.7.3(react-dom@17.0.2)(react@17.0.2) - rc-tree-select: 5.8.0(react-dom@17.0.2)(react@17.0.2) - rc-upload: 4.3.4(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + qrcode.react: 3.1.0(react@18.2.0) + rc-cascader: 3.10.3(react-dom@18.2.0)(react@18.2.0) + rc-checkbox: 3.0.0(react-dom@18.2.0)(react@18.2.0) + rc-collapse: 3.5.2(react-dom@18.2.0)(react@18.2.0) + rc-dialog: 9.1.0(react-dom@18.2.0)(react@18.2.0) + rc-drawer: 6.1.5(react-dom@18.2.0)(react@18.2.0) + rc-dropdown: 4.0.1(react-dom@18.2.0)(react@18.2.0) + rc-field-form: 1.30.0(react-dom@18.2.0)(react@18.2.0) + rc-image: 5.16.0(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.0.4(react-dom@18.2.0)(react@18.2.0) + rc-input-number: 7.4.2(react-dom@18.2.0)(react@18.2.0) + rc-mentions: 2.2.0(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.8.4(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-notification: 5.0.3(react-dom@18.2.0)(react@18.2.0) + rc-pagination: 3.3.1(react-dom@18.2.0)(react@18.2.0) + rc-picker: 3.6.2(dayjs@1.11.7)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0) + rc-progress: 3.4.1(react-dom@18.2.0)(react@18.2.0) + rc-rate: 2.10.0(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-segmented: 2.1.2(react-dom@18.2.0)(react@18.2.0) + rc-select: 14.4.3(react-dom@18.2.0)(react@18.2.0) + rc-slider: 10.1.1(react-dom@18.2.0)(react@18.2.0) + rc-steps: 6.0.0(react-dom@18.2.0)(react@18.2.0) + rc-switch: 4.1.0(react-dom@18.2.0)(react@18.2.0) + rc-table: 7.31.1(react-dom@18.2.0)(react@18.2.0) + rc-tabs: 12.5.10(react-dom@18.2.0)(react@18.2.0) + rc-textarea: 1.2.2(react-dom@18.2.0)(react@18.2.0) + rc-tooltip: 6.0.1(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.7.3(react-dom@18.2.0)(react@18.2.0) + rc-tree-select: 5.8.0(react-dom@18.2.0)(react@18.2.0) + rc-upload: 4.3.4(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) scroll-into-view-if-needed: 3.0.10 throttle-debounce: 5.0.0 transitivePeerDependencies: @@ -6041,7 +6039,7 @@ packages: /core-util-is@1.0.2: resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} - /cosmiconfig-typescript-loader@1.0.9(@types/node@18.15.10)(cosmiconfig@7.1.0)(typescript@4.9.5): + /cosmiconfig-typescript-loader@1.0.9(@types/node@18.15.10)(cosmiconfig@7.1.0)(typescript@5.1.6): resolution: {integrity: sha512-tRuMRhxN4m1Y8hP9SNYfz7jRwt8lZdWxdjg/ohg5esKmsndJIn4yT96oJVcf5x0eA11taXl+sIp+ielu529k6g==} engines: {node: '>=12', npm: '>=6'} peerDependencies: @@ -6051,8 +6049,8 @@ packages: dependencies: '@types/node': 18.15.10 cosmiconfig: 7.1.0 - ts-node: 10.9.1(@types/node@18.15.10)(typescript@4.9.5) - typescript: 4.9.5 + ts-node: 10.9.1(@types/node@18.15.10)(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -6079,11 +6077,6 @@ packages: yaml: 1.10.2 dev: false - /craco-alias@3.0.1: - resolution: {integrity: sha512-N+Qaf/Gr/f3o5ZH2TQjMu5NhR9PnT1ZYsfejpNvZPpB0ujdrhsSr4Ct6GVjnV5ostCVquhTKJpIVBKyL9qDQYA==} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. - dev: false - /create-ecdh@4.0.4: resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==} dependencies: @@ -7169,7 +7162,7 @@ packages: eslint: 7.32.0 dev: true - /eslint-config-react-app@6.0.0(@typescript-eslint/eslint-plugin@4.33.0)(@typescript-eslint/parser@4.33.0)(babel-eslint@10.1.0)(eslint-plugin-flowtype@5.10.0)(eslint-plugin-import@2.27.5)(eslint-plugin-jest@24.7.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.32.2)(eslint-plugin-testing-library@3.10.2)(eslint@7.32.0)(typescript@4.9.5): + /eslint-config-react-app@6.0.0(@typescript-eslint/eslint-plugin@4.33.0)(@typescript-eslint/parser@4.33.0)(babel-eslint@10.1.0)(eslint-plugin-flowtype@5.10.0)(eslint-plugin-import@2.27.5)(eslint-plugin-jest@24.7.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.32.2)(eslint-plugin-testing-library@3.10.2)(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-bpoAAC+YRfzq0dsTk+6v9aHm/uqnDwayNAXleMypGl6CpxI9oXXscVHo4fk3eJPIn+rsbtNetB4r/ZIidFIE8A==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -7193,19 +7186,19 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@4.9.5) - '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@5.1.6) babel-eslint: 10.1.0(eslint@7.32.0) confusing-browser-globals: 1.0.11 eslint: 7.32.0 eslint-plugin-flowtype: 5.10.0(eslint@7.32.0) eslint-plugin-import: 2.27.5(@typescript-eslint/parser@4.33.0)(eslint@7.32.0) - eslint-plugin-jest: 24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@4.9.5) + eslint-plugin-jest: 24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@5.1.6) eslint-plugin-jsx-a11y: 6.7.1(eslint@7.32.0) eslint-plugin-react: 7.32.2(eslint@7.32.0) eslint-plugin-react-hooks: 4.6.0(eslint@7.32.0) - eslint-plugin-testing-library: 3.10.2(eslint@7.32.0)(typescript@4.9.5) - typescript: 4.9.5 + eslint-plugin-testing-library: 3.10.2(eslint@7.32.0)(typescript@5.1.6) + typescript: 5.1.6 dev: false /eslint-import-resolver-node@0.3.7: @@ -7238,7 +7231,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@5.1.6) debug: 3.2.7(supports-color@6.1.0) eslint: 7.32.0 eslint-import-resolver-node: 0.3.7 @@ -7267,7 +7260,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@5.1.6) debug: 3.2.7(supports-color@6.1.0) eslint: 7.32.0 eslint-import-resolver-node: 0.3.7 @@ -7305,7 +7298,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@5.1.6) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -7338,7 +7331,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.57.0(eslint@7.32.0)(typescript@5.1.6) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -7361,7 +7354,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@4.9.5): + /eslint-plugin-jest@24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==} engines: {node: '>=10'} peerDependencies: @@ -7371,8 +7364,8 @@ packages: '@typescript-eslint/eslint-plugin': optional: true dependencies: - '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@4.9.5) - '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@5.1.6) eslint: 7.32.0 transitivePeerDependencies: - supports-color @@ -7434,13 +7427,13 @@ packages: semver: 6.3.0 string.prototype.matchall: 4.0.8 - /eslint-plugin-testing-library@3.10.2(eslint@7.32.0)(typescript@4.9.5): + /eslint-plugin-testing-library@3.10.2(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA==} engines: {node: ^10.12.0 || >=12.0.0, npm: '>=6'} peerDependencies: eslint: ^5 || ^6 || ^7 dependencies: - '@typescript-eslint/experimental-utils': 3.10.1(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/experimental-utils': 3.10.1(eslint@7.32.0)(typescript@5.1.6) eslint: 7.32.0 transitivePeerDependencies: - supports-color @@ -8032,7 +8025,7 @@ packages: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} dev: true - /fork-ts-checker-webpack-plugin@4.1.6(eslint@7.32.0)(typescript@4.9.5)(webpack@4.44.2): + /fork-ts-checker-webpack-plugin@4.1.6(eslint@7.32.0)(typescript@5.1.6)(webpack@4.44.2): resolution: {integrity: sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==} engines: {node: '>=6.11.5', yarn: '>=1.0.0'} peerDependencies: @@ -8053,7 +8046,7 @@ packages: minimatch: 3.1.2 semver: 5.7.1 tapable: 1.1.3 - typescript: 4.9.5 + typescript: 5.1.6 webpack: 4.44.2 worker-rpc: 0.1.1 transitivePeerDependencies: @@ -11294,11 +11287,11 @@ packages: find-up: 3.0.0 dev: false - /pnp-webpack-plugin@1.6.4(typescript@4.9.5): + /pnp-webpack-plugin@1.6.4(typescript@5.1.6): resolution: {integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==} engines: {node: '>=6'} dependencies: - ts-pnp: 1.2.0(typescript@4.9.5) + ts-pnp: 1.2.0(typescript@5.1.6) transitivePeerDependencies: - typescript dev: false @@ -12176,12 +12169,12 @@ packages: resolution: {integrity: sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==} dev: false - /qrcode.react@3.1.0(react@17.0.2): + /qrcode.react@3.1.0(react@18.2.0): resolution: {integrity: sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - react: 17.0.2 + react: 18.2.0 dev: false /qs@6.10.4: @@ -12258,7 +12251,7 @@ packages: unpipe: 1.0.0 dev: false - /rc-align@4.0.15(react-dom@17.0.2)(react@17.0.2): + /rc-align@4.0.15(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==} peerDependencies: react: '>=16.9.0' @@ -12267,13 +12260,13 @@ packages: '@babel/runtime': 7.21.0 classnames: 2.3.2 dom-align: 1.12.4 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 dev: false - /rc-cascader@3.10.3(react-dom@17.0.2)(react@17.0.2): + /rc-cascader@3.10.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-RBK1u59a2m/RKY8F+UvW9pUXdPv7bCxh2s2DAb81QjXX7TbwSX92Y0tICYo/Bo8fRsAh2g+7RXVf488/98ijkA==} peerDependencies: react: '>=16.9.0' @@ -12282,14 +12275,14 @@ packages: '@babel/runtime': 7.21.0 array-tree-filter: 2.1.0 classnames: 2.3.2 - rc-select: 14.4.3(react-dom@17.0.2)(react@17.0.2) - rc-tree: 5.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-select: 14.4.3(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-checkbox@3.0.0(react-dom@17.0.2)(react@17.0.2): + /rc-checkbox@3.0.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-tOEs1+wWDUei7DuP2EsJCZfam5vxMjKTCGcZdXVgsiOcNszc41Esycbo31P0/jFwUAPmd5oPYFWkcnFUCTLZxA==} peerDependencies: react: '>=16.9.0' @@ -12297,12 +12290,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-collapse@3.5.2(react-dom@17.0.2)(react@17.0.2): + /rc-collapse@3.5.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-/TNiT3DW1t3sUCiVD/DPUYooJZ3BLA93/2rZsB3eM2bGJCCla2X9D2E4tgm7LGMQGy5Atb2lMUn2FQuvQNvavQ==} peerDependencies: react: '>=16.9.0' @@ -12310,43 +12303,43 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-dialog@9.1.0(react-dom@17.0.2)(react@17.0.2): + /rc-dialog@9.1.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-5ry+JABAWEbaKyYsmITtrJbZbJys8CtMyzV8Xn4LYuXMeUx5XVHNyJRoqLFE4AzBuXXzOWeaC49cg+XkxK6kHA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/portal': 1.1.1(react-dom@17.0.2)(react@17.0.2) + '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-drawer@6.1.5(react-dom@17.0.2)(react@17.0.2): + /rc-drawer@6.1.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-MDRomQXFi+tvDuwsRAddJ2Oy2ayLCZ29weMzp3rJFO9UNEVLEVV7nuyx5lEgNJIdM//tE6wWQV95cTUiMVqD6w==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/portal': 1.1.1(react-dom@17.0.2)(react@17.0.2) + '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-dropdown@4.0.1(react-dom@17.0.2)(react@17.0.2): + /rc-dropdown@4.0.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-OdpXuOcme1rm45cR0Jzgfl1otzmU4vuBVb+etXM8vcaULGokAKVpKlw8p6xzspG7jGd/XxShvq+N3VNEfk/l5g==} peerDependencies: react: '>=16.11.0' @@ -12354,13 +12347,13 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-trigger: 5.3.4(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-field-form@1.30.0(react-dom@17.0.2)(react@17.0.2): + /rc-field-form@1.30.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-hCBa3/+m9SSuEPILSsxB/wd3ZFEmNTQfIhThhMaMp05fLwDDw+2K26lEZf5NuChQlx90VVNUOYmTslH6Ks4tpA==} engines: {node: '>=8.x'} peerDependencies: @@ -12369,28 +12362,28 @@ packages: dependencies: '@babel/runtime': 7.21.0 async-validator: 4.2.5 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-image@5.16.0(react-dom@17.0.2)(react@17.0.2): + /rc-image@5.16.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-11DOye57IgTXh2yTsmxFNynZJG3tdx8RZnnaqb38eYWrBPPyhVHIuURxyiSZ8B68lEUAggR7SBA0Zb95KP/CyQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/portal': 1.1.1(react-dom@17.0.2)(react@17.0.2) + '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-dialog: 9.1.0(react-dom@17.0.2)(react@17.0.2) - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-dialog: 9.1.0(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-input-number@7.4.2(react-dom@17.0.2)(react@17.0.2): + /rc-input-number@7.4.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-yGturTw7WGP+M1GbJ+UTAO7L4buxeW6oilhL9Sq3DezsRS8/9qec4UiXUbeoiX9bzvRXH11JvgskBtxSp4YSNg==} peerDependencies: react: '>=16.9.0' @@ -12399,12 +12392,12 @@ packages: '@babel/runtime': 7.21.0 '@rc-component/mini-decimal': 1.0.1 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-input@1.0.4(react-dom@17.0.2)(react@17.0.2): + /rc-input@1.0.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-clY4oneVHRtKHYf/HCxT/MO+4BGzCIywSNLosXWOm7fcQAS0jQW7n0an8Raa8JMB8kpxc8m28p7SNwFZmlMj6g==} peerDependencies: react: '>=16.0.0' @@ -12412,29 +12405,29 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-mentions@2.2.0(react-dom@17.0.2)(react@17.0.2): + /rc-mentions@2.2.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-R7ncCldr02uKgJBBPlXdtnOGQIjZ9C3uoIMi4fabU3CPFdmefYlNF6QM4u2AzgcGt8V0KkoHTN5T6HPdUpet8g==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-input: 1.0.4(react-dom@17.0.2)(react@17.0.2) - rc-menu: 9.8.4(react-dom@17.0.2)(react@17.0.2) - rc-textarea: 1.2.2(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-input: 1.0.4(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.8.4(react-dom@18.2.0)(react@18.2.0) + rc-textarea: 1.2.2(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-menu@9.8.4(react-dom@17.0.2)(react@17.0.2): + /rc-menu@9.8.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-lmw2j8I2fhdIzHmC9ajfImfckt0WDb2KVJJBBRIsxPEw2kGkEfjLMUoB1NgiNT/Q5cC8PdjGOGQjHJIJMwyNMw==} peerDependencies: react: '>=16.9.0' @@ -12442,15 +12435,15 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-overflow: 1.3.0(react-dom@17.0.2)(react@17.0.2) - rc-trigger: 5.3.4(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-overflow: 1.3.0(react-dom@18.2.0)(react@18.2.0) + rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-motion@2.7.3(react-dom@17.0.2)(react@17.0.2): + /rc-motion@2.7.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==} peerDependencies: react: '>=16.9.0' @@ -12458,12 +12451,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-notification@5.0.3(react-dom@17.0.2)(react@17.0.2): + /rc-notification@5.0.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+wHbHu6RiTNtsZYx42WxWA+tC5m0qyKvJAauO4/6LIEyJspK8fRlFQz+OCFgFwGuNs3cOdo9tLs+cPfztSZwbQ==} engines: {node: '>=8.x'} peerDependencies: @@ -12472,13 +12465,13 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-overflow@1.3.0(react-dom@17.0.2)(react@17.0.2): + /rc-overflow@1.3.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-p2Qt4SWPTHAYl4oAao1THy669Fm5q8pYBDBHRaFOekCvcdcrgIx0ByXQMEkyPm8wUDX4BK6aARWecvCRc/7CTA==} peerDependencies: react: '>=16.9.0' @@ -12486,13 +12479,13 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-pagination@3.3.1(react-dom@17.0.2)(react@17.0.2): + /rc-pagination@3.3.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-eI4dSeB3OrFxll7KzWa3ZH63LV2tHxt0AUmZmDwuI6vc3CK5lZhaKUYq0fRowb5586hN+L26j5WZoSz9cwEfjg==} peerDependencies: react: '>=16.9.0' @@ -12500,11 +12493,11 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-picker@3.6.2(dayjs@1.11.7)(moment@2.29.4)(react-dom@17.0.2)(react@17.0.2): + /rc-picker@3.6.2(dayjs@1.11.7)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-acLNCi2WTNAuvTtcEzKp72mU15ni0sqrIKVlEcj04KgLZxhlVPMabCS+Sc8VuOCPJbOcW0XeOydbNnJbWTvzxg==} engines: {node: '>=8.x'} peerDependencies: @@ -12525,16 +12518,16 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 dayjs: 1.11.7 moment: 2.29.4 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-progress@3.4.1(react-dom@17.0.2)(react@17.0.2): + /rc-progress@3.4.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-eAFDHXlk8aWpoXl0llrenPMt9qKHQXphxcVsnKs0FHC6eCSk1ebJtyaVjJUzKe0233ogiLDeEFK1Uihz3s67hw==} peerDependencies: react: '>=16.9.0' @@ -12542,12 +12535,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-rate@2.10.0(react-dom@17.0.2)(react@17.0.2): + /rc-rate@2.10.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-TCjEpKPeN1m0EnGDDbb1KyxjNTJRzoReiPdtbrBJEey4Ryf/UGOQ6vqmz2yC6DJdYVDVUoZPdoz043ryh0t/nQ==} engines: {node: '>=8.x'} peerDependencies: @@ -12556,12 +12549,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-resize-observer@1.3.1(react-dom@17.0.2)(react@17.0.2): + /rc-resize-observer@1.3.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-iFUdt3NNhflbY3mwySv5CA1TC06zdJ+pfo0oc27xpf4PIOvfZwZGtD9Kz41wGYqC4SLio93RVAirSSpYlV/uYg==} peerDependencies: react: '>=16.9.0' @@ -12569,13 +12562,13 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 dev: false - /rc-segmented@2.1.2(react-dom@17.0.2)(react@17.0.2): + /rc-segmented@2.1.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-qGo1bCr83ESXpXVOCXjFe1QJlCAQXyi9KCiy8eX3rIMYlTeJr/ftySIaTnYsitL18SvWf5ZEHsfqIWoX0EMfFQ==} peerDependencies: react: '>=16.0.0' @@ -12583,13 +12576,13 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-select@14.4.3(react-dom@17.0.2)(react@17.0.2): + /rc-select@14.4.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-qoz4gNqm3SN+4dYKSCRiRkxKSEEdbS3jC6gdFYoYwEjDZ9sdQFo5jHlfQbF+hhai01HOoj1Hf8Gq6tpUvU+Gmw==} engines: {node: '>=8.x'} peerDependencies: @@ -12597,17 +12590,17 @@ packages: react-dom: '*' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-overflow: 1.3.0(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - rc-virtual-list: 3.4.13(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-overflow: 1.3.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + rc-virtual-list: 3.4.13(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-slider@10.1.1(react-dom@17.0.2)(react@17.0.2): + /rc-slider@10.1.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-gn8oXazZISEhnmRinI89Z/JD/joAaM35jp+gDtIVSTD/JJMCCBqThqLk1SVJmvtfeiEF/kKaFY0+qt4SDHFUDw==} engines: {node: '>=8.x'} peerDependencies: @@ -12616,12 +12609,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-steps@6.0.0(react-dom@17.0.2)(react@17.0.2): + /rc-steps@6.0.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+KfMZIty40mYCQSDvYbZ1jwnuObLauTiIskT1hL4FFOBHP6ZOr8LK0m143yD3kEN5XKHSEX1DIwCj3AYZpoeNQ==} engines: {node: '>=8.x'} peerDependencies: @@ -12630,12 +12623,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-switch@4.1.0(react-dom@17.0.2)(react@17.0.2): + /rc-switch@4.1.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==} peerDependencies: react: '>=16.9.0' @@ -12643,12 +12636,12 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-table@7.31.1(react-dom@17.0.2)(react@17.0.2): + /rc-table@7.31.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-KZPi35aGpv2VaL1Jbc58FBJo063HtKyVjhOFWX4AkBV7tjHHQokMdUoua5E+GPJh6QZUpK/a8PjKa9IZzPLIEA==} engines: {node: '>=8.x'} peerDependencies: @@ -12656,15 +12649,15 @@ packages: react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/context': 1.3.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/context': 1.3.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-tabs@12.5.10(react-dom@17.0.2)(react@17.0.2): + /rc-tabs@12.5.10(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Ay0l0jtd4eXepFH9vWBvinBjqOpqzcsJTerBGwJy435P2S90Uu38q8U/mvc1sxUEVOXX5ZCFbxcWPnfG3dH+tQ==} engines: {node: '>=8.x'} peerDependencies: @@ -12673,16 +12666,16 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-dropdown: 4.0.1(react-dom@17.0.2)(react@17.0.2) - rc-menu: 9.8.4(react-dom@17.0.2)(react@17.0.2) - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-dropdown: 4.0.1(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.8.4(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-textarea@1.2.2(react-dom@17.0.2)(react@17.0.2): + /rc-textarea@1.2.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-S9fkiek5VezfwJe2McEs/NH63xgnnZ4iDh6a8n01mIfzyNJj0HkS0Uz6boyR3/eONYjmKaqhrpuJJuEClRDEBw==} peerDependencies: react: '>=16.9.0' @@ -12690,27 +12683,27 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-input: 1.0.4(react-dom@17.0.2)(react@17.0.2) - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-input: 1.0.4(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-tooltip@6.0.1(react-dom@17.0.2)(react@17.0.2): + /rc-tooltip@6.0.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-MdvPlsD1fDSxKp9+HjXrc/CxLmA/s11QYIh1R7aExxfodKP7CZA++DG1AjrW80F8IUdHYcR43HAm0Y2BYPelHA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - '@rc-component/trigger': 1.10.0(react-dom@17.0.2)(react@17.0.2) + '@rc-component/trigger': 1.10.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-tree-select@5.8.0(react-dom@17.0.2)(react@17.0.2): + /rc-tree-select@5.8.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-NozrkVLR8k3cpx8R5/YFmJMptgOacR5zEQHZGMQg31bD6jEgGiJeOn2cGRI6x0Xdyvi1CSqCbUsIoqiej74wzw==} peerDependencies: react: '*' @@ -12718,14 +12711,14 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-select: 14.4.3(react-dom@17.0.2)(react@17.0.2) - rc-tree: 5.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-select: 14.4.3(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-tree@5.7.3(react-dom@17.0.2)(react@17.0.2): + /rc-tree@5.7.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Oql2S9+ZmT+mfTp5SNo1XM0QvkENjc0mPRFsHWRFSPuKird0OYMZZKmLznUJ+0aGDeFFWN42wiUZJtMFhrLgLw==} engines: {node: '>=10.x'} peerDependencies: @@ -12734,14 +12727,14 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - rc-virtual-list: 3.4.13(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + rc-virtual-list: 3.4.13(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-trigger@5.3.4(react-dom@17.0.2)(react@17.0.2): + /rc-trigger@5.3.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==} engines: {node: '>=8.x'} peerDependencies: @@ -12750,14 +12743,14 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-align: 4.0.15(react-dom@17.0.2)(react@17.0.2) - rc-motion: 2.7.3(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-align: 4.0.15(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-upload@4.3.4(react-dom@17.0.2)(react@17.0.2): + /rc-upload@4.3.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-uVbtHFGNjHG/RyAfm9fluXB6pvArAGyAx8z7XzXXyorEgVIWj6mOlriuDm0XowDHYz4ycNK0nE0oP3cbFnzxiQ==} peerDependencies: react: '>=16.9.0' @@ -12765,24 +12758,24 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /rc-util@5.30.0(react-dom@17.0.2)(react@17.0.2): + /rc-util@5.30.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-uaWpF/CZGyXuhQG71MWxkU+0bWkPEgqZUxEv251Cu7p3kpHDNm5+Ygu/U8ux0a/zbfGW8PsKcJL0XVBOMrlIZg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.21.0 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) react-is: 16.13.1 dev: false - /rc-virtual-list@3.4.13(react-dom@17.0.2)(react@17.0.2): + /rc-virtual-list@3.4.13(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cPOVDmcNM7rH6ANotanMDilW/55XnFPw0Jh/GQYtrzZSy3AmWvCnqVNyNC/pgg3lfVmX2994dlzAhuUrd4jG7w==} engines: {node: '>=8.x'} peerDependencies: @@ -12791,10 +12784,10 @@ packages: dependencies: '@babel/runtime': 7.21.0 classnames: 2.3.2 - rc-resize-observer: 1.3.1(react-dom@17.0.2)(react@17.0.2) - rc-util: 5.30.0(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.30.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /react-app-polyfill@2.0.0: @@ -12809,18 +12802,18 @@ packages: whatwg-fetch: 3.6.2 dev: false - /react-cookie@4.1.1(react@17.0.2): + /react-cookie@4.1.1(react@18.2.0): resolution: {integrity: sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==} peerDependencies: react: '>= 16.3.0' dependencies: '@types/hoist-non-react-statics': 3.3.1 hoist-non-react-statics: 3.3.2 - react: 17.0.2 + react: 18.2.0 universal-cookie: 4.0.4 dev: false - /react-dev-utils@11.0.4(eslint@7.32.0)(typescript@4.9.5)(webpack@4.44.2): + /react-dev-utils@11.0.4(eslint@7.32.0)(typescript@5.1.6)(webpack@4.44.2): resolution: {integrity: sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==} engines: {node: '>=10'} peerDependencies: @@ -12839,7 +12832,7 @@ packages: escape-string-regexp: 2.0.0 filesize: 6.1.0 find-up: 4.1.0 - fork-ts-checker-webpack-plugin: 4.1.6(eslint@7.32.0)(typescript@4.9.5)(webpack@4.44.2) + fork-ts-checker-webpack-plugin: 4.1.6(eslint@7.32.0)(typescript@5.1.6)(webpack@4.44.2) global-modules: 2.0.0 globby: 11.0.1 gzip-size: 5.1.1 @@ -12854,7 +12847,7 @@ packages: shell-quote: 1.7.2 strip-ansi: 6.0.0 text-table: 0.2.0 - typescript: 4.9.5 + typescript: 5.1.6 webpack: 4.44.2 transitivePeerDependencies: - eslint @@ -12862,15 +12855,14 @@ packages: - vue-template-compiler dev: false - /react-dom@17.0.2(react@17.0.2): - resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} + /react-dom@18.2.0(react@18.2.0): + resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} peerDependencies: - react: 17.0.2 + react: ^18.2.0 dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 - react: 17.0.2 - scheduler: 0.20.2 + react: 18.2.0 + scheduler: 0.23.0 dev: false /react-error-overlay@6.0.11: @@ -12881,7 +12873,7 @@ packages: resolution: {integrity: sha512-ioBMEIxd4ePw4YtaloTUgqhQGqz5ebDdC4slEpLgy2sLx1LuZBC9iYCwDymTXzcntw6K1dHX183ulP32nNdG7w==} dev: false - /react-i18next@12.2.0(i18next@22.4.13)(react-dom@17.0.2)(react@17.0.2): + /react-i18next@12.2.0(i18next@22.4.13)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-5XeVgSygaGfyFmDd2WcXvINRw2WEC1XviW1LXY/xLOEMzsCFRwKqfnHN+hUjla8ZipbVJR27GCMSuTr0BhBBBQ==} peerDependencies: i18next: '>= 19.0.0' @@ -12897,8 +12889,8 @@ packages: '@babel/runtime': 7.21.0 html-parse-stringify: 3.0.1 i18next: 22.4.13 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /react-is@16.13.1: @@ -12912,7 +12904,7 @@ packages: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: false - /react-qr-code@2.0.11(react@17.0.2): + /react-qr-code@2.0.11(react@18.2.0): resolution: {integrity: sha512-P7mvVM5vk9NjGdHMt4Z0KWeeJYwRAtonHTghZT2r+AASinLUUKQ9wfsGH2lPKsT++gps7hXmaiMGRvwTDEL9OA==} peerDependencies: react: ^16.x || ^17.x || ^18.x @@ -12923,7 +12915,7 @@ packages: dependencies: prop-types: 15.8.1 qr.js: 0.0.0 - react: 17.0.2 + react: 18.2.0 dev: false /react-refresh@0.8.3: @@ -12931,7 +12923,7 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@5.3.4(react@17.0.2): + /react-router-dom@5.3.4(react@18.2.0): resolution: {integrity: sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==} peerDependencies: react: '>=15' @@ -12940,13 +12932,13 @@ packages: history: 4.10.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 17.0.2 - react-router: 5.3.4(react@17.0.2) + react: 18.2.0 + react-router: 5.3.4(react@18.2.0) tiny-invariant: 1.3.1 tiny-warning: 1.0.3 dev: false - /react-router@5.3.4(react@17.0.2): + /react-router@5.3.4(react@18.2.0): resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==} peerDependencies: react: '>=15' @@ -12957,13 +12949,13 @@ packages: loose-envify: 1.4.0 path-to-regexp: 1.8.0 prop-types: 15.8.1 - react: 17.0.2 + react: 18.2.0 react-is: 16.13.1 tiny-invariant: 1.3.1 tiny-warning: 1.0.3 dev: false - /react-scripts@4.0.3(eslint@7.32.0)(react@17.0.2)(typescript@4.9.5): + /react-scripts@4.0.3(eslint@7.32.0)(react@18.2.0)(typescript@5.1.6): resolution: {integrity: sha512-S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A==} engines: {node: ^10.12.0 || >=12.0.0} hasBin: true @@ -12978,8 +12970,8 @@ packages: '@babel/core': 7.12.3 '@pmmmwh/react-refresh-webpack-plugin': 0.4.3(react-refresh@0.8.3)(webpack-dev-server@3.11.1)(webpack@4.44.2) '@svgr/webpack': 5.5.0 - '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@4.9.5) - '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@4.9.5) + '@typescript-eslint/eslint-plugin': 4.33.0(@typescript-eslint/parser@4.33.0)(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/parser': 4.33.0(eslint@7.32.0)(typescript@5.1.6) babel-eslint: 10.1.0(eslint@7.32.0) babel-jest: 26.6.3(@babel/core@7.12.3) babel-loader: 8.1.0(@babel/core@7.12.3)(webpack@4.44.2) @@ -12992,14 +12984,14 @@ packages: dotenv: 8.2.0 dotenv-expand: 5.1.0 eslint: 7.32.0 - eslint-config-react-app: 6.0.0(@typescript-eslint/eslint-plugin@4.33.0)(@typescript-eslint/parser@4.33.0)(babel-eslint@10.1.0)(eslint-plugin-flowtype@5.10.0)(eslint-plugin-import@2.27.5)(eslint-plugin-jest@24.7.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.32.2)(eslint-plugin-testing-library@3.10.2)(eslint@7.32.0)(typescript@4.9.5) + eslint-config-react-app: 6.0.0(@typescript-eslint/eslint-plugin@4.33.0)(@typescript-eslint/parser@4.33.0)(babel-eslint@10.1.0)(eslint-plugin-flowtype@5.10.0)(eslint-plugin-import@2.27.5)(eslint-plugin-jest@24.7.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.32.2)(eslint-plugin-testing-library@3.10.2)(eslint@7.32.0)(typescript@5.1.6) eslint-plugin-flowtype: 5.10.0(eslint@7.32.0) eslint-plugin-import: 2.27.5(@typescript-eslint/parser@4.33.0)(eslint@7.32.0) - eslint-plugin-jest: 24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@4.9.5) + eslint-plugin-jest: 24.7.0(@typescript-eslint/eslint-plugin@4.33.0)(eslint@7.32.0)(typescript@5.1.6) eslint-plugin-jsx-a11y: 6.7.1(eslint@7.32.0) eslint-plugin-react: 7.32.2(eslint@7.32.0) eslint-plugin-react-hooks: 4.6.0(eslint@7.32.0) - eslint-plugin-testing-library: 3.10.2(eslint@7.32.0)(typescript@4.9.5) + eslint-plugin-testing-library: 3.10.2(eslint@7.32.0)(typescript@5.1.6) eslint-webpack-plugin: 2.7.0(eslint@7.32.0)(webpack@4.44.2) file-loader: 6.1.1(webpack@4.44.2) fs-extra: 9.1.0 @@ -13011,16 +13003,16 @@ packages: jest-watch-typeahead: 0.6.1(jest@26.6.0) mini-css-extract-plugin: 0.11.3(webpack@4.44.2) optimize-css-assets-webpack-plugin: 5.0.4(webpack@4.44.2) - pnp-webpack-plugin: 1.6.4(typescript@4.9.5) + pnp-webpack-plugin: 1.6.4(typescript@5.1.6) postcss-flexbugs-fixes: 4.2.1 postcss-loader: 3.0.0 postcss-normalize: 8.0.1 postcss-preset-env: 6.7.0 postcss-safe-parser: 5.0.2 prompts: 2.4.0 - react: 17.0.2 + react: 18.2.0 react-app-polyfill: 2.0.0 - react-dev-utils: 11.0.4(eslint@7.32.0)(typescript@4.9.5)(webpack@4.44.2) + react-dev-utils: 11.0.4(eslint@7.32.0)(typescript@5.1.6)(webpack@4.44.2) react-refresh: 0.8.3 resolve: 1.18.1 resolve-url-loader: 3.1.5 @@ -13028,8 +13020,8 @@ packages: semver: 7.3.2 style-loader: 1.3.0(webpack@4.44.2) terser-webpack-plugin: 4.2.3(webpack@4.44.2) - ts-pnp: 1.2.0(typescript@4.9.5) - typescript: 4.9.5 + ts-pnp: 1.2.0(typescript@5.1.6) + typescript: 5.1.6 url-loader: 4.1.1(file-loader@6.1.1)(webpack@4.44.2) webpack: 4.44.2 webpack-dev-server: 3.11.1(webpack@4.44.2) @@ -13059,7 +13051,7 @@ packages: - webpack-plugin-serve dev: false - /react-transition-group@4.4.5(react-dom@17.0.2)(react@17.0.2): + /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} peerDependencies: react: '>=16.6.0' @@ -13069,16 +13061,15 @@ packages: dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false - /react@17.0.2: - resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} + /react@18.2.0: + resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 dev: false /read-pkg-up@7.0.1: @@ -13140,7 +13131,7 @@ packages: dev: false optional: true - /recoil@0.7.7(react-dom@17.0.2)(react@17.0.2): + /recoil@0.7.7(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-8Og5KPQW9LwC577Vc7Ug2P0vQshkv1y3zG3tSSkWMqkWSwHmE+by06L8JtnGocjW6gcCvfwB3YtrJG6/tWivNQ==} peerDependencies: react: '>=16.13.1' @@ -13153,8 +13144,8 @@ packages: optional: true dependencies: hamt_plus: 1.0.2 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /recursive-readdir@2.2.2: @@ -13578,11 +13569,10 @@ packages: xmlchars: 2.2.0 dev: false - /scheduler@0.20.2: - resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==} + /scheduler@0.23.0: + resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 dev: false /schema-utils@1.0.0: @@ -14607,7 +14597,7 @@ packages: resolution: {integrity: sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==} dev: false - /ts-node@10.9.1(@types/node@18.15.10)(typescript@4.9.5): + /ts-node@10.9.1(@types/node@18.15.10)(typescript@5.1.6): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -14633,12 +14623,12 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.9.5 + typescript: 5.1.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: false - /ts-pnp@1.2.0(typescript@4.9.5): + /ts-pnp@1.2.0(typescript@5.1.6): resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==} engines: {node: '>=6'} peerDependencies: @@ -14647,7 +14637,7 @@ packages: typescript: optional: true dependencies: - typescript: 4.9.5 + typescript: 5.1.6 dev: false /tsconfig-paths@3.14.2: @@ -14664,14 +14654,14 @@ packages: /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - /tsutils@3.21.0(typescript@4.9.5): + /tsutils@3.21.0(typescript@5.1.6): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.9.5 + typescript: 5.1.6 /tty-browserify@0.0.0: resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==} @@ -14761,9 +14751,9 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: false - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} hasBin: true /unbox-primitive@1.0.2: @@ -14933,14 +14923,14 @@ packages: querystring: 0.2.0 dev: false - /use-state-with-callback@3.0.2(react-dom@17.0.2)(react@17.0.2): + /use-state-with-callback@3.0.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-gs6t5ilsbi2UvoYXdw8+dwQg6yT3QfO/sYhm5Wa3tfwcL6BSad85FiET8ZtTWid4gjul1T1TJ8ReV4Wk1B7UZg==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) dev: false /use@3.1.1: diff --git a/src/components/AdaptiveDiv/AdaptiveModal.tsx b/src/components/AdaptiveDiv/AdaptiveModal.tsx index 28cccabf9..5f9ed6d94 100644 --- a/src/components/AdaptiveDiv/AdaptiveModal.tsx +++ b/src/components/AdaptiveDiv/AdaptiveModal.tsx @@ -3,7 +3,7 @@ import { ReactNode } from "react"; import theme from "tools/theme"; export type AdaptiveModalProps = { - width?: PixelValue; // CSSProperties["width"]; + width?: PixelValue; // CSS["width"]; children: ReactNode; }; diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx index e6d521e6e..ae27859dc 100644 --- a/src/components/Button/index.tsx +++ b/src/components/Button/index.tsx @@ -1,6 +1,7 @@ -import { ReactNode, useState } from "react"; +import { ReactNode } from "react"; + +import useHoverProps from "hooks/theme/useHoverProps"; -import hoverEventSet from "tools/hoverEventSet"; import theme, { Font } from "tools/theme"; type ButtonType = "purple" | "purple_inset" | "gray" | "white"; @@ -28,8 +29,7 @@ const Button = ({ className, children, }: ButtonProps) => { - const [isHover, setHover] = useState(false); - const [isClicked, setClicked] = useState(false); + const [hoverProps, isHover, isClicked] = useHoverProps(); const getColor = () => { switch (type) { @@ -87,7 +87,7 @@ const Button = ({ onClick={disabled ? undefined : onClick} style={style} className={className} - {...hoverEventSet(setHover, setClicked)} + {...hoverProps} > {children} diff --git a/src/pages/Chatting/Container/index.tsx b/src/components/Chat/Container/index.tsx similarity index 100% rename from src/pages/Chatting/Container/index.tsx rename to src/components/Chat/Container/index.tsx diff --git a/src/components/Chat/Header/SideMenu.tsx b/src/components/Chat/Header/SideMenu.tsx new file mode 100644 index 000000000..adfa38b92 --- /dev/null +++ b/src/components/Chat/Header/SideMenu.tsx @@ -0,0 +1,226 @@ +import dayjs from "dayjs"; +import { memo, useCallback, useState } from "react"; + +import useIsTimeOver from "hooks/useIsTimeOver"; + +import DottedLine from "components/DottedLine"; +import { ModalChatCancel, ModalRoomShare } from "components/ModalPopup"; +import User from "components/User"; + +import alertAtom from "atoms/alert"; +import { useSetRecoilState } from "recoil"; + +import { day2str, dayServerToClient } from "tools/day"; +import theme from "tools/theme"; + +import ArrowForwardRoundedIcon from "@mui/icons-material/ArrowForwardRounded"; +import CalendarTodayRoundedIcon from "@mui/icons-material/CalendarTodayRounded"; +import KeyboardArrowRightRoundedIcon from "@mui/icons-material/KeyboardArrowRightRounded"; +import LocalTaxiRoundedIcon from "@mui/icons-material/LocalTaxiRounded"; +import LocationOnRoundedIcon from "@mui/icons-material/LocationOnRounded"; +import LogoutOutlinedIcon from "@mui/icons-material/LogoutOutlined"; +import PeopleAltRoundedIcon from "@mui/icons-material/PeopleAltRounded"; +import ReportGmailerrorredRoundedIcon from "@mui/icons-material/ReportGmailerrorredRounded"; +import ShareRoundedIcon from "@mui/icons-material/ShareRounded"; + +type SideMenuButtonProps = { + type: "share" | "report" | "taxi"; + onClick?: () => void; +}; + +type SideMenuProps = { + roomInfo: Room; + isOpen: boolean; + setIsOpen: (x: boolean) => void; +}; + +const SideMenuButton = ({ type, onClick }: SideMenuButtonProps) => { + const style = { + padding: "16px 0", + cursor: "pointer", + display: "flex", + gap: "8px", + alignItems: "center", + }; + const styleIcon = { width: "16px", height: "16px", fill: theme.black }; + const styleText = { ...theme.font14, color: theme.black, flex: 1 }; + const styleArrow = { ...styleIcon, fill: theme.gray_text }; + + const { icon, text } = { + share: { icon: , text: "공유하기" }, + report: { + icon: , + text: "신고하기", + }, + taxi: { + icon: , + text: "택시 호출하기", + }, + }[type]; + + return ( +
+ {icon} +
{text}
+ +
+ ); +}; + +const SideMenu = ({ roomInfo, isOpen, setIsOpen }: SideMenuProps) => { + const setAlert = useSetRecoilState(alertAtom); + const [isOpenShare, setIsOpenShare] = useState(false); + const [isOpenCancel, setIsOpenCancel] = useState(false); + const isDepart = useIsTimeOver(dayServerToClient(roomInfo.time)); // 방 출발 여부 + + const onClikcShare = useCallback(() => setIsOpenShare(true), []); + const onClickCancel = useCallback( + () => + isDepart + ? setAlert("출발 시각이 이전인 방은 탑승 취소를 할 수 없습니다.") + : setIsOpenCancel(true), + [isDepart] + ); + + const styleBackground = { + position: "absolute" as any, + top: 0, + left: 0, + width: "100%", + height: "100%", + background: theme.black_40, + zIndex: theme.zIndex_background, + pointerEvents: isOpen ? "auto" : ("none" as any), + opacity: isOpen ? 1 : 0, + transition: "opacity 0.3s", + }; + const style = { + position: "absolute" as any, + top: 0, + right: isOpen ? 0 : "max(calc(-100% + 60px), -370px)", + width: "min(calc(100% - 60px), 370px)", + height: "100%", + padding: "0 16px", + boxSizing: "border-box" as any, + background: theme.white, + zIndex: theme.zIndex_modal - 1, + transition: "right 0.3s", + display: "flex", + flexDirection: "column" as any, + }; + const styleNameSection = { + margin: "16px 8px", + display: "flex", + alignItems: "center", + gap: "12px", + }; + const styleIcon = { + width: "16px", + height: "16px", + fill: theme.black, + }; + const styleInfoSection = { + padding: "20px 0", + }; + const styleInfo = { + ...theme.font14, + color: theme.black, + }; + const styleUsers = { + paddingTop: "16px", + display: "flex", + flexDirection: "column" as any, + gap: "6px", + }; + + return ( + <> +
setIsOpen(false)}>
+
+
+
+ setIsOpen(false)} + /> +
+ {roomInfo.name} +
+
+ +
+
+
+ +
+ {roomInfo.from?.koName}  →  {roomInfo.to?.koName} +
+
+
+
+ +
{day2str(dayjs(roomInfo.time))}
+
+
+ +
+
+ +
+ 참여 / 최대 인원 :{" "} + {roomInfo.part.length}명{" "} + + / {roomInfo.maxPartLength}명 + +
+
+
+ {/* @fixme @todo 유저의 정산 정보 넘겨주나? */} + {roomInfo.part.map((item) => ( + + ))} +
+
+ + + {/* + + + */} +
+ +
+ +
+ 탑승 취소 +
+
+
+
+ + + + ); +}; + +export default memo(SideMenu); diff --git a/src/components/Chat/Header/index.tsx b/src/components/Chat/Header/index.tsx new file mode 100644 index 000000000..733a6dc6d --- /dev/null +++ b/src/components/Chat/Header/index.tsx @@ -0,0 +1,119 @@ +import { useState } from "react"; +import { Link, useHistory } from "react-router-dom"; + +import type { LayoutType } from "types/chat"; + +import useButterflyState from "hooks/useButterflyState"; + +import SideMenu from "./SideMenu"; + +import theme from "tools/theme"; + +import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded"; +import CloseFullscreenRoundedIcon from "@mui/icons-material/CloseFullscreenRounded"; +import MenuRoundedIcon from "@mui/icons-material/MenuRounded"; +import OpenInFullRoundedIcon from "@mui/icons-material/OpenInFullRounded"; + +type HeaderProps = { + layoutType: LayoutType; + roomInfo: Nullable; +}; + +const Header = ({ layoutType, roomInfo }: HeaderProps) => { + const history = useHistory(); + const butterflyState = useButterflyState(); + const [isOpenSideMenu, setIsOpenSideMenu] = useState(false); + + const style = { + overflow: "hidden", + background: layoutType === "fullchat" ? theme.white : theme.purple, + boxShadow: theme.shadow_3, + zIndex: theme.zIndex_nav, + height: "40px", + padding: "calc(max(5px, env(safe-area-inset-top)) + 12px) 20px 12px", + transition: "height 0.3s", + display: "flex", + gap: "16px", + alignItems: "center", + }; + const styleIconLarge = { + fill: layoutType === "fullchat" ? theme.purple : theme.white, + ...theme.cursor(), + width: "24px", + height: "24px", + }; + const styleIconSmall = { + ...styleIconLarge, + width: "22px", + height: "22px", + }; + const styleInfo = { + flexGrow: 1, + height: "40px", + display: "flex", + overflow: "hidden", + flexDirection: "column" as any, + justifyContent: "space-between", + }; + const styleName = { + color: layoutType === "fullchat" ? theme.purple : theme.white, + ...theme.ellipsis, + ...theme.font18, + }; + const styleFromTo = { + color: layoutType === "fullchat" ? theme.gray_text : theme.white, + width: "100%", + ...theme.ellipsis, + ...theme.font12, + }; + + if (!roomInfo) return null; + return ( + <> + +
+ history.replace("/myroom") + : () => history.goBack() + } + /> +
+
{roomInfo.name}
+
+ {roomInfo.from?.koName}  →   + {roomInfo.to?.koName} +
+
+ {layoutType === "fullchat" && butterflyState !== "fold" && ( + ({ + ...location, + pathname: `/myroom/${roomInfo._id}`, + })} + replace + > + + + )} + {layoutType === "sidechat" && ( + + + + )} + setIsOpenSideMenu(true)} + /> +
+ + ); +}; + +export default Header; diff --git a/src/components/Chat/MessageForm/InputText/BodyImage.tsx b/src/components/Chat/MessageForm/InputText/BodyImage.tsx new file mode 100644 index 000000000..745e83cac --- /dev/null +++ b/src/components/Chat/MessageForm/InputText/BodyImage.tsx @@ -0,0 +1,149 @@ +import { useCallback, useEffect, useState } from "react"; + +import useSendMessage from "hooks/chat/useSendMessage"; + +import ButtonSend from "./ButtonSend"; + +import alertAtom from "atoms/alert"; +import { useSetRecoilState } from "recoil"; + +import { convertImage, getImageSrc } from "tools/image"; +import theme from "tools/theme"; + +import CloseRoundedIcon from "@mui/icons-material/CloseRounded"; +import MotionPhotosOnIcon from "@mui/icons-material/RotateLeftRounded"; + +type BodyImageProps = { + uploadedImage: File; + onChangeUploadedImage?: (file: Nullable) => void; + sendMessage: ReturnType; +}; + +const BodyImage = ({ + uploadedImage, + onChangeUploadedImage, + sendMessage, +}: BodyImageProps) => { + const setAlert = useSetRecoilState(alertAtom); + const [convertedImage, setConvertedImage] = useState>(null); // 압축된 업로드된 이미지 파일 + const [convertedImageSrc, setConvertedImageSrc] = + useState>(null); // 압축된 업로드된 이미지 파일 + const [isSendingMessage, setIsSendingMessage] = useState(false); + + const isMessageValid: boolean = !!convertedImage && !!convertedImageSrc; + + const onSend = async () => { + if (isMessageValid) { + setIsSendingMessage(true); + const result = await sendMessage("image", { + file: convertedImage as File, + }); + if (result) onChangeUploadedImage?.(null); + setIsSendingMessage(false); + } + }; + const onClickClose = useCallback(() => { + onChangeUploadedImage?.(null); + }, [onChangeUploadedImage]); + const onError = useCallback(() => { + setAlert("이미지 업로드에 실패하였습니다."); + onChangeUploadedImage?.(null); + }, [onChangeUploadedImage]); + + useEffect(() => { + const convert = async () => { + if (!uploadedImage) return setConvertedImage(null); + const _convertedImage = await convertImage(uploadedImage); + if (!_convertedImage) { + setAlert("이미지 업로드에 실패하였습니다."); + onChangeUploadedImage?.(null); + } else setConvertedImage(_convertedImage); + }; + convert(); + }, [uploadedImage]); + + useEffect(() => { + const getSrc = async () => { + if (!convertedImage) return setConvertedImageSrc(null); + const _convertedImageSrc = await getImageSrc(convertedImage); + if (!_convertedImageSrc) { + setAlert("이미지 업로드에 실패하였습니다."); + onChangeUploadedImage?.(null); + } else setConvertedImageSrc(_convertedImageSrc); + }; + getSrc(); + }, [convertedImage]); + + return ( + <> +
+ {convertedImageSrc ? ( + + ) : ( +
+ +
+ )} +
+ +
+
+ + + ); +}; + +export default BodyImage; diff --git a/src/components/Chat/MessageForm/InputText/BodyText.tsx b/src/components/Chat/MessageForm/InputText/BodyText.tsx new file mode 100644 index 000000000..a0bd06803 --- /dev/null +++ b/src/components/Chat/MessageForm/InputText/BodyText.tsx @@ -0,0 +1,115 @@ +import { + ChangeEvent, + KeyboardEvent, + useCallback, + useEffect, + useRef, + useState, +} from "react"; + +import useSendMessage from "hooks/chat/useSendMessage"; + +import ButtonSend from "./ButtonSend"; + +import regExpTest from "tools/regExpTest"; +import theme from "tools/theme"; + +type BodyTextProps = { + sendMessage: ReturnType; +}; + +const BodyText = ({ sendMessage }: BodyTextProps) => { + const wrapRef = useRef(null); + const textareaRef = useRef(null); + const [height, setHeight] = useState("32px"); + const [message, setMessage] = useState(""); + const [isSendingMessage, setIsSendingMessage] = useState(false); + + const isEnterPressed = useRef(false); + const isShiftPressed = useRef(false); + + const isMessageValid: boolean = + regExpTest.chatMsg(message) && !isSendingMessage; + + const onSend = async () => { + textareaRef.current?.focus(); + if (isMessageValid) { + setIsSendingMessage(true); + const result = await sendMessage("text", { text: message }); + if (result) setMessage(""); + setIsSendingMessage(false); + } + }; + const onKeyEvent = (e: KeyboardEvent, v: boolean) => { + if (e.code === "ShiftLeft" || e.code === "ShiftRight") + isShiftPressed.current = v; + if (e.code === "Enter") isEnterPressed.current = v; + }; + const onChange = (e: ChangeEvent) => { + if (isEnterPressed.current && !isShiftPressed.current) { + onSend(); + return; + } + const msg = e.target.value; + if (!isSendingMessage) setMessage(msg); + }; + const onKeyDown = (e: KeyboardEvent) => + onKeyEvent(e, true); + const onKeyUp = (e: KeyboardEvent) => + onKeyEvent(e, false); + + const resizeEvent = useCallback(() => { + if (!wrapRef.current) return; + const cacheHeight = wrapRef.current.style.height; + wrapRef.current.style.height = "0"; + const newHeight = `${Math.max( + Math.min( + textareaRef.current ? textareaRef.current.scrollHeight : 0, + document.body.clientHeight / 3 + ), + 32 + )}px`; + wrapRef.current.style.height = cacheHeight; + setHeight(newHeight); + }, [setHeight]); + + useEffect(() => { + resizeEvent(); + window.addEventListener("resize", resizeEvent); + return () => window.removeEventListener("resize", resizeEvent); + }, []); + useEffect(resizeEvent, [message]); + + return ( +
+