diff --git a/.umirc.js b/.umirc.js index 7770644..8541a2c 100644 --- a/.umirc.js +++ b/.umirc.js @@ -5,11 +5,12 @@ const path = require('path') const lessToJs = require('less-vars-to-js') const isDevelopment = process.env.NODE_ENV === 'development' -const { theme } = require('antd/lib') -const { convertLegacyToken } = require('@ant-design/compatible/lib') +const { theme } = require('antd') const mapToken = theme.defaultAlgorithm(theme.defaultSeed) -const v4Token = convertLegacyToken(mapToken) +const v4Token = Object.fromEntries( + Object.entries(mapToken).map(([k, v]) => [k, typeof v === 'string' ? v : String(v)]) +) // how to speed compile: https://umijs.org/guide/boost-compile-speed export default { diff --git a/package.json b/package.json index f2271ac..f7f3ee0 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "dependencies": { "@ant-design/icons": "^4.8.3", "@lingui/react": "^4.14.1", - "antd": "^5.16.1", + "@rc-component/picker": "^1.9.0", + "antd": "^6.0.0", "axios": "^0.21.4", "classnames": "^2.5.1", "d3-shape": "^2.1.0", @@ -30,8 +31,10 @@ "path-to-regexp": "^6.2.2", "prop-types": "^15.8.1", "qs": "^6.12.0", + "react": "^18.2.0", "react-adsense": "^0.1.0", "react-countup": "^4.4.0", + "react-dom": "^18.2.0", "react-draft-wysiwyg": "^1.15.0", "react-helmet": "^6.1.0", "react-highcharts": "^16.1.0", @@ -40,7 +43,6 @@ "store": "^2.0.12" }, "devDependencies": { - "@ant-design/compatible": "^5.1.2", "@babel/core": "^7.29.0", "@babel/preset-react": "^7.24.1", "@lingui/cli": "^4.14.1", diff --git a/src/layouts/index.js b/src/layouts/index.js index 1f11593..05bf758 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -5,9 +5,9 @@ import { i18n } from "@lingui/core" import { I18nProvider } from '@lingui/react' import { getLocale } from 'utils' import { zh, en, pt } from 'make-plural/plurals' -import zhCN from 'antd/lib/locale/zh_CN' -import enUS from 'antd/lib/locale/en_US' -import ptBR from 'antd/lib/locale/pt_BR' +import zhCN from 'antd/locale/zh_CN' +import enUS from 'antd/locale/en_US' +import ptBR from 'antd/locale/pt_BR' import BaseLayout from './BaseLayout' diff --git a/src/themes/default.less b/src/themes/default.less index 7d2603d..d2ab562 100644 --- a/src/themes/default.less +++ b/src/themes/default.less @@ -14,3 +14,12 @@ @font-size-base: 13px; @text-color: #666; @hover-color: #f9f9fc; + +// Legacy token fallbacks (required by project's Less files) +@primary-color: #1890ff; +@success-color: #52c41a; +@warning-color: #faad14; +@error-color: #ff4d4f; +@outline-fade: 20%; +@text-color-secondary: fade(@text-color, 35%); +@ease-in-out: ease-in-out;