diff --git a/.storybook/preview.js b/.storybook/preview.js index 7c492bd2..a0db22d9 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,4 +1,3 @@ -import "antd/dist/antd.variable.min.css"; import "../src/renderer/index.css"; import { ConfigProvider } from "antd"; import i18n from "../src/test-utils/i18n"; diff --git a/package.json b/package.json index 5c4e9ac0..ffbb1ddf 100644 --- a/package.json +++ b/package.json @@ -43,14 +43,14 @@ } }, "dependencies": { - "@ant-design/icons": "^4.7.0", + "@ant-design/icons": "^5.6.1", "@apollo/client": "3.5.5", "@graphql-tools/schema": "^10.0.3", "@octokit/core": "^3.5.1", "@pothos/core": "^3.1.2", "@pothos/plugin-simple-objects": "^3.0.1", "@rehooks/local-storage": "^2.4.4", - "antd": "4.17.2", + "antd": "5.24.0", "apollo-bus-link": "^0.4.5", "apollo-link-logger": "^2.0.1", "base64-arraybuffer": "^1.0.2", diff --git a/src/renderer/AntProvider.tsx b/src/renderer/AntProvider.tsx index e3984419..5ece26e3 100644 --- a/src/renderer/AntProvider.tsx +++ b/src/renderer/AntProvider.tsx @@ -1,8 +1,7 @@ import { ConfigProvider } from "antd"; -import { Locale } from "antd/lib/locale-provider"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import { fetchAntLocale } from "./i18n/ant"; +import { fetchAntLocale, Locale } from "./i18n/ant"; const AntProvider: React.FC = ({ children }) => { const [locale, setLocale] = useState(); diff --git a/src/renderer/compatibility/CompatNoticeModal.tsx b/src/renderer/compatibility/CompatNoticeModal.tsx index 1d9e83e5..b7e229e9 100644 --- a/src/renderer/compatibility/CompatNoticeModal.tsx +++ b/src/renderer/compatibility/CompatNoticeModal.tsx @@ -28,7 +28,7 @@ const WebCompatInfo: React.FC = ({ setVisible(flag)} overlay={ diff --git a/src/renderer/components/SettingsMenu.tsx b/src/renderer/components/SettingsMenu.tsx index 658877b4..b732d2aa 100644 --- a/src/renderer/components/SettingsMenu.tsx +++ b/src/renderer/components/SettingsMenu.tsx @@ -20,7 +20,7 @@ const SettingsMenu: React.FC = () => { setVisible(flag)} overlay={ diff --git a/src/renderer/components/__tests__/VersionTargetForm.spec.tsx b/src/renderer/components/__tests__/VersionTargetForm.spec.tsx index d95a6bd3..5428f69c 100644 --- a/src/renderer/components/__tests__/VersionTargetForm.spec.tsx +++ b/src/renderer/components/__tests__/VersionTargetForm.spec.tsx @@ -204,20 +204,20 @@ describe("", () => { - First value + Second value - @@ -52,11 +52,11 @@ - /> - + @@ -62,11 +62,11 @@ + /> + + + - Select firmware version + + Some placeholder for version + + + - - Select firmware version - + Some placeholder for version - - - + @@ -202,11 +202,11 @@ + /> + + + - Select radio model + + Some placeholder for version + + + - - Select radio model - + Some placeholder for version - - -