diff --git a/package.json b/package.json index 2bf84187..8f0b0a6d 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "@types/history": "^4.7.11", "@types/jest": "^29.2.1", "@types/lodash": "^4.14.186", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "@types/react-helmet": "^6.1.5", "@umijs/lint": "^4.0.34", "@umijs/max": "^4.0.33", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7c567f0..035f973b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,8 +11,8 @@ specifiers: '@types/history': ^4.7.11 '@types/jest': ^29.2.1 '@types/lodash': ^4.14.186 - '@types/react': ^17.0.0 - '@types/react-dom': ^17.0.0 + '@types/react': ^18.0.0 + '@types/react-dom': ^18.0.0 '@types/react-helmet': ^6.1.5 '@umijs/lint': ^4.0.34 '@umijs/max': ^4.0.33 @@ -68,11 +68,11 @@ devDependencies: '@types/history': 4.7.11 '@types/jest': 29.2.4 '@types/lodash': 4.14.191 - '@types/react': 17.0.52 - '@types/react-dom': 17.0.18 + '@types/react': 18.0.26 + '@types/react-dom': 18.0.9 '@types/react-helmet': 6.1.6 '@umijs/lint': 4.0.35_jig7mdlcju4lt57i33g5qicbgy - '@umijs/max': 4.0.35_6f5xgdrvtycvcwlwz2s4cplhka + '@umijs/max': 4.0.35_2caics5fpyhs6yxqssqr7m26zi cross-env: 7.0.3 eslint: 8.29.0 express: 4.18.2 @@ -86,7 +86,7 @@ devDependencies: swagger-ui-dist: 4.15.5 ts-node: 10.9.1_typescript@4.9.4 typescript: 4.9.4 - umi-presets-pro: 2.0.0_gz5lvdtqfbr75jwfu5jagggsw4 + umi-presets-pro: 2.0.0_reqejh5yylq3ssqvxkfphxdmza packages: @@ -114,7 +114,7 @@ packages: react: 18.2.0 dev: true - /@alita/plugins/3.2.6_gz5lvdtqfbr75jwfu5jagggsw4: + /@alita/plugins/3.2.6_reqejh5yylq3ssqvxkfphxdmza: resolution: {integrity: sha512-XRhY2x07oVZ4s8PRIvVrcf7XXP7S2rfv4CvFd37oV2lOSM7mFvgagw1LGHdY2peBnT63r8yVfFPoRLmrZFjCjg==} dependencies: '@alita/babel-transform-jsx-class': 0.0.2 @@ -122,7 +122,7 @@ packages: '@alita/request': 3.1.0 '@alita/types': 3.1.0 '@umijs/bundler-utils': 4.0.34 - '@umijs/plugins': 4.0.34_gz5lvdtqfbr75jwfu5jagggsw4 + '@umijs/plugins': 4.0.34_reqejh5yylq3ssqvxkfphxdmza '@umijs/utils': 4.0.34 ahooks: 3.7.2_react@18.2.0 antd-mobile-alita: 2.3.4_biqbaboplfbrettd7655fr4n2y @@ -2743,20 +2743,20 @@ packages: '@floating-ui/core': 0.6.2 dev: true - /@floating-ui/react-dom-interactions/0.3.1_bynveq746y3g6trbvbqtemqkhe: + /@floating-ui/react-dom-interactions/0.3.1_2wivdsbsvmk3pblmocpmpqwn2e: resolution: {integrity: sha512-tP2KEh7EHJr5hokSBHcPGojb+AorDNUf0NYfZGg/M+FsMvCOOsSEeEF0O1NDfETIzDnpbHnCs0DuvCFhSMSStg==} dependencies: - '@floating-ui/react-dom': 0.6.3_bynveq746y3g6trbvbqtemqkhe - aria-hidden: 1.2.2_nik5kfrnrsctffq6o6vr6ceura + '@floating-ui/react-dom': 0.6.3_2wivdsbsvmk3pblmocpmpqwn2e + aria-hidden: 1.2.2_3d3cqnhbk5jgdxsmxlr7d24np4 point-in-polygon: 1.1.0 - use-isomorphic-layout-effect: 1.1.2_nik5kfrnrsctffq6o6vr6ceura + use-isomorphic-layout-effect: 1.1.2_3d3cqnhbk5jgdxsmxlr7d24np4 transitivePeerDependencies: - '@types/react' - react - react-dom dev: true - /@floating-ui/react-dom/0.6.3_bynveq746y3g6trbvbqtemqkhe: + /@floating-ui/react-dom/0.6.3_2wivdsbsvmk3pblmocpmpqwn2e: resolution: {integrity: sha512-hC+pS5D6AgS2wWjbmSQ6UR6Kpy+drvWGJIri6e1EDGADTPsCaa4KzCgmCczHrQeInx9tqs81EyDmbKJYY2swKg==} peerDependencies: react: '>=16.8.0' @@ -2765,7 +2765,7 @@ packages: '@floating-ui/dom': 0.4.5 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 - use-isomorphic-layout-effect: 1.1.2_nik5kfrnrsctffq6o6vr6ceura + use-isomorphic-layout-effect: 1.1.2_3d3cqnhbk5jgdxsmxlr7d24np4 transitivePeerDependencies: - '@types/react' dev: true @@ -3789,7 +3789,7 @@ packages: /@types/hoist-non-react-statics/3.3.1: resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} dependencies: - '@types/react': 17.0.52 + '@types/react': 18.0.26 hoist-non-react-statics: 3.3.2 dev: true @@ -3892,35 +3892,29 @@ packages: resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} dev: true - /@types/react-dom/17.0.18: - resolution: {integrity: sha512-rLVtIfbwyur2iFKykP2w0pl/1unw26b5td16d5xMgp7/yjTHomkyxPYChFoCr/FtEX1lN9wY6lFj1qvKdS5kDw==} - dependencies: - '@types/react': 17.0.52 - dev: true - /@types/react-dom/18.0.9: resolution: {integrity: sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==} dependencies: - '@types/react': 17.0.52 + '@types/react': 18.0.26 dev: true /@types/react-helmet/6.1.6: resolution: {integrity: sha512-ZKcoOdW/Tg+kiUbkFCBtvDw0k3nD4HJ/h/B9yWxN4uDO8OkRksWTO+EL+z/Qu3aHTeTll3Ro0Cc/8UhwBCMG5A==} dependencies: - '@types/react': 17.0.52 + '@types/react': 18.0.26 dev: true /@types/react-redux/7.1.24: resolution: {integrity: sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==} dependencies: '@types/hoist-non-react-statics': 3.3.1 - '@types/react': 17.0.52 + '@types/react': 18.0.26 hoist-non-react-statics: 3.3.2 redux: 4.2.0 dev: true - /@types/react/17.0.52: - resolution: {integrity: sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A==} + /@types/react/18.0.26: + resolution: {integrity: sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -4667,16 +4661,16 @@ packages: - supports-color dev: true - /@umijs/max/4.0.35_6f5xgdrvtycvcwlwz2s4cplhka: + /@umijs/max/4.0.35_2caics5fpyhs6yxqssqr7m26zi: resolution: {integrity: sha512-fc00c56J3nlP+5rLJg2aDqnqcDbfKr2o2sxwhKpuXPXZDtHIPDUrUG5HVWDKmJEoEbVLfsmNhPhaoeRyPNw/cA==} hasBin: true dependencies: '@umijs/lint': 4.0.35_p4csibq5ks3vioan4srswcqg5u - '@umijs/plugins': 4.0.35_dx4u7azef3skd24mgiwvchjwe4 + '@umijs/plugins': 4.0.35_ii54bkuv4u5lulfkc7hunvvogq antd: 4.24.5_biqbaboplfbrettd7655fr4n2y eslint: 8.15.0 stylelint: 14.8.2 - umi: 4.0.35_b3zq4vnhqh7moefpp7mqr7nqry + umi: 4.0.35_ew6kx7lupa6qwvuxl2p2nnz2da transitivePeerDependencies: - '@babel/core' - '@babel/helper-module-imports' @@ -4761,7 +4755,7 @@ packages: tsx: 3.12.1 dev: true - /@umijs/plugins/4.0.34_gz5lvdtqfbr75jwfu5jagggsw4: + /@umijs/plugins/4.0.34_reqejh5yylq3ssqvxkfphxdmza: resolution: {integrity: sha512-6mkqpXUqkaSARUw/P8vveFDKmXtYZXVDzwZsB1QMTxCHWZ3JoqiiN3blIbxvjwRRUGlHRpaHyvqTC1s+y0Va2w==} dependencies: '@ahooksjs/use-request': 2.8.15_react@18.2.0 @@ -4784,7 +4778,7 @@ packages: moment: 2.29.4 qiankun: 2.8.4 react-intl: 3.12.1_react@18.2.0 - react-redux: 8.0.5_x3na3lw4ol2i5xbh2dqwzqy74u + react-redux: 8.0.5_6fpxtwwxc52cyvwzdgczt4jvpq redux: 4.2.0 warning: 4.0.3 transitivePeerDependencies: @@ -4806,7 +4800,7 @@ packages: - vite dev: true - /@umijs/plugins/4.0.35_dx4u7azef3skd24mgiwvchjwe4: + /@umijs/plugins/4.0.35_ii54bkuv4u5lulfkc7hunvvogq: resolution: {integrity: sha512-+Abxf9fKmjDdV+ZPpSXDiR5OnNvMflYQopkQVPs21r58maF6gNwtjcQHCEewWyG+mTgnX6f4RBxXyJBg/V3evw==} dependencies: '@ahooksjs/use-request': 2.8.15_react@18.2.0 @@ -4829,7 +4823,7 @@ packages: moment: 2.29.4 qiankun: 2.8.4 react-intl: 3.12.1_react@18.2.0 - react-redux: 8.0.5_x3na3lw4ol2i5xbh2dqwzqy74u + react-redux: 8.0.5_6fpxtwwxc52cyvwzdgczt4jvpq redux: 4.2.0 styled-components: 6.0.0-beta.6_biqbaboplfbrettd7655fr4n2y warning: 4.0.3 @@ -4853,7 +4847,7 @@ packages: - vite dev: true - /@umijs/plugins/4.0.35_gz5lvdtqfbr75jwfu5jagggsw4: + /@umijs/plugins/4.0.35_reqejh5yylq3ssqvxkfphxdmza: resolution: {integrity: sha512-+Abxf9fKmjDdV+ZPpSXDiR5OnNvMflYQopkQVPs21r58maF6gNwtjcQHCEewWyG+mTgnX6f4RBxXyJBg/V3evw==} dependencies: '@ahooksjs/use-request': 2.8.15_react@18.2.0 @@ -4876,7 +4870,7 @@ packages: moment: 2.29.4 qiankun: 2.8.4 react-intl: 3.12.1_react@18.2.0 - react-redux: 8.0.5_x3na3lw4ol2i5xbh2dqwzqy74u + react-redux: 8.0.5_6fpxtwwxc52cyvwzdgczt4jvpq redux: 4.2.0 styled-components: 6.0.0-beta.6_biqbaboplfbrettd7655fr4n2y warning: 4.0.3 @@ -4900,7 +4894,7 @@ packages: - vite dev: true - /@umijs/preset-umi/4.0.35_wuwhjehtb3nhae7urou2zggzfe: + /@umijs/preset-umi/4.0.35_gxci7zjypbzwkagmgqo6pdnhwa: resolution: {integrity: sha512-+BQNP2zNlhG9HzQxVJGEhadelVuCBj6jRV6xZgjBrRHzbZZdp2SwBfiMCRnnhZqhMllcqM7Slr2ecm1RJa1hdA==} dependencies: '@umijs/ast': 4.0.35 @@ -4917,7 +4911,7 @@ packages: '@umijs/server': 4.0.35 '@umijs/utils': 4.0.35 babel-plugin-dynamic-import-node: 2.3.3 - click-to-react-component: 1.0.8_bynveq746y3g6trbvbqtemqkhe + click-to-react-component: 1.0.8_2wivdsbsvmk3pblmocpmpqwn2e core-js: 3.22.4 current-script-polyfill: 1.0.0 enhanced-resolve: 5.9.3 @@ -5423,7 +5417,7 @@ packages: /argparse/2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - /aria-hidden/1.2.2_nik5kfrnrsctffq6o6vr6ceura: + /aria-hidden/1.2.2_3d3cqnhbk5jgdxsmxlr7d24np4: resolution: {integrity: sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==} engines: {node: '>=10'} peerDependencies: @@ -5433,7 +5427,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.52 + '@types/react': 18.0.26 react: 18.1.0 tslib: 2.4.1 dev: true @@ -6231,12 +6225,12 @@ packages: string-width: 4.2.3 dev: true - /click-to-react-component/1.0.8_bynveq746y3g6trbvbqtemqkhe: + /click-to-react-component/1.0.8_2wivdsbsvmk3pblmocpmpqwn2e: resolution: {integrity: sha512-YBNYOp00udy+NBEnUmM/3Df0Yco1iHNQ8k0ltlJVcDYK9AuYt14xPoJicBh/BokLqbzkci1p+pbdY5r4JXZC4g==} peerDependencies: react: '>=16.8.0' dependencies: - '@floating-ui/react-dom-interactions': 0.3.1_bynveq746y3g6trbvbqtemqkhe + '@floating-ui/react-dom-interactions': 0.3.1_2wivdsbsvmk3pblmocpmpqwn2e htm: 3.1.1 react: 18.1.0 react-merge-refs: 1.1.0 @@ -13692,7 +13686,7 @@ packages: react-is: 17.0.2 dev: true - /react-redux/8.0.5_x3na3lw4ol2i5xbh2dqwzqy74u: + /react-redux/8.0.5_6fpxtwwxc52cyvwzdgczt4jvpq: resolution: {integrity: sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw==} peerDependencies: '@types/react': ^16.8 || ^17.0 || ^18.0 @@ -13715,8 +13709,8 @@ packages: dependencies: '@babel/runtime': 7.20.6 '@types/hoist-non-react-statics': 3.3.1 - '@types/react': 17.0.52 - '@types/react-dom': 17.0.18 + '@types/react': 18.0.26 + '@types/react-dom': 18.0.9 '@types/use-sync-external-store': 0.0.3 hoist-non-react-statics: 3.3.2 react: 18.2.0 @@ -15584,12 +15578,12 @@ packages: resolution: {integrity: sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==} dev: true - /umi-presets-pro/2.0.0_gz5lvdtqfbr75jwfu5jagggsw4: + /umi-presets-pro/2.0.0_reqejh5yylq3ssqvxkfphxdmza: resolution: {integrity: sha512-x/aQygHQlRl9TcHQf90thEfJaDaZjAVeh/R3iYnj9SZAZmZT9vzkvmjVGHanppYiA6yAo1MJtxI6zgDETv3tUA==} dependencies: - '@alita/plugins': 3.2.6_gz5lvdtqfbr75jwfu5jagggsw4 + '@alita/plugins': 3.2.6_reqejh5yylq3ssqvxkfphxdmza '@umijs/max-plugin-openapi': 2.0.0 - '@umijs/plugins': 4.0.35_gz5lvdtqfbr75jwfu5jagggsw4 + '@umijs/plugins': 4.0.35_reqejh5yylq3ssqvxkfphxdmza '@umijs/request-record': 1.1.2 swagger-ui-dist: 4.15.5 transitivePeerDependencies: @@ -15635,7 +15629,7 @@ packages: slash2: 2.0.0 dev: true - /umi/4.0.35_b3zq4vnhqh7moefpp7mqr7nqry: + /umi/4.0.35_ew6kx7lupa6qwvuxl2p2nnz2da: resolution: {integrity: sha512-5+k3dp19X51hoGimdzyk4igztm4Mx0AvcEgHVkJcEj/cFo2ydzVoDhjofqnGkpwoLPovu4aU4dLpFS6zZaT13g==} engines: {node: '>=14'} hasBin: true @@ -15645,7 +15639,7 @@ packages: '@umijs/bundler-webpack': 4.0.35_typescript@4.9.4 '@umijs/core': 4.0.35 '@umijs/lint': 4.0.35_p4csibq5ks3vioan4srswcqg5u - '@umijs/preset-umi': 4.0.35_wuwhjehtb3nhae7urou2zggzfe + '@umijs/preset-umi': 4.0.35_gxci7zjypbzwkagmgqo6pdnhwa '@umijs/renderer-react': 4.0.35_biqbaboplfbrettd7655fr4n2y '@umijs/server': 4.0.35 '@umijs/test': 4.0.35 @@ -15801,7 +15795,7 @@ packages: querystring: 0.2.0 dev: true - /use-isomorphic-layout-effect/1.1.2_nik5kfrnrsctffq6o6vr6ceura: + /use-isomorphic-layout-effect/1.1.2_3d3cqnhbk5jgdxsmxlr7d24np4: resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' @@ -15810,7 +15804,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.52 + '@types/react': 18.0.26 react: 18.1.0 dev: true