Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(antd): pin ant-design/icons dependency version #5934

Merged
merged 24 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fa74d6c
fix: lock antd-icons dependency version
bombillazo May 8, 2024
c74e5d3
Merge branch 'master' into task/lock-antd-icons-dep
bombillazo May 17, 2024
434cc5c
Merge branch 'releases/june' into task/lock-antd-icons-dep
BatuhanW May 23, 2024
c7b4af2
chore: update changeset and lock file
bombillazo May 23, 2024
0ce365b
Merge branch 'refinedev:master' into task/lock-antd-icons-dep
bombillazo May 23, 2024
0d7432d
Merge branch 'releases/june' into task/lock-antd-icons-dep
aliemir May 24, 2024
d9f0020
chore: merge
bombillazo May 24, 2024
067d82f
chore: add changeset file
bombillazo May 24, 2024
80ae94c
Merge branch 'task/lock-antd-icons-dep' of https://github.com/bombill…
bombillazo May 24, 2024
4b1238c
Merge branch 'releases/june' into task/lock-antd-icons-dep
bombillazo May 24, 2024
e61484d
Merge branch 'releases/june' into task/lock-antd-icons-dep
bombillazo May 24, 2024
04e0947
chore: remove unnecessary changeset file
bombillazo May 24, 2024
a423ad4
Merge branch 'task/lock-antd-icons-dep' of https://github.com/bombill…
bombillazo May 24, 2024
8ea3b70
Merge branch 'releases/june' into task/lock-antd-icons-dep
BatuhanW May 28, 2024
9c446bb
chore(blog): update @ant-design/icons version in blog post
BatuhanW May 29, 2024
e716d4b
Merge branch 'releases/june' into task/lock-antd-icons-dep
bombillazo May 29, 2024
f4a03cb
chore: update changeset
aliemir Jun 3, 2024
d298eeb
chore(inferencer): update icon usages
aliemir Jun 3, 2024
c7361f5
chore(antd): update icon usages with ts-expect-error
aliemir Jun 3, 2024
e57a683
chore(examples): update ant-design/icons usage with ts-expect-error
aliemir Jun 3, 2024
8cc15f0
Merge branch 'releases/june' into task/lock-antd-icons-dep
aliemir Jun 3, 2024
1fc633b
chore: update pnpm-lock
aliemir Jun 3, 2024
b260597
Merge branch 'releases/june' into task/lock-antd-icons-dep
aliemir Jun 3, 2024
758c80a
Merge branch 'releases/june' into task/lock-antd-icons-dep
aliemir Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/bright-moles-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@refinedev/inferencer": patch
"@refinedev/antd": patch
---

lock the `ant-design/icons` version to `5.0.1`
2 changes: 1 addition & 1 deletion documentation/blog/2023-04-11-refine-invoicer-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ If we open the app in our code editor, we can see that **Refine**'s optional pac

```json title="package.json"
"dependencies": {
"@ant-design/icons": "^5.0.1",
"@ant-design/icons": "5.0.1",
"@react-pdf/renderer": "^3.1.8",
// highlight-start
"@refinedev/antd": "^5.3.10",
Expand Down
2 changes: 1 addition & 1 deletion examples/app-crm-minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@ant-design/cssinjs": "^1.17.2",
"@ant-design/icons": "^5.0.1",
"@ant-design/icons": "5.0.1",
"@ant-design/plots": "^1.2.5",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
Expand Down
1 change: 1 addition & 0 deletions examples/app-crm-minimal/src/components/icon/TextIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ export const TextIconSvg = () => (
);

export const TextIcon = (props: Partial<CustomIconComponentProps>) => (
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<Icon component={TextIconSvg} {...props} />
);
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export const AccountSettings = ({ opened, setOpened, userId }: Props) => {
<Text strong>Account Settings</Text>
<Button
type="text"
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<CloseOutlined />}
onClick={() => closeModal()}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const CurrentUser = () => {
>
<Button
style={{ textAlign: "left" }}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<SettingOutlined />}
type="text"
block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,33 @@ export const ContactStatusTag = ({ status }: Props) => {
case "NEW":
case "CONTACTED":
case "INTERESTED":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <PlayCircleOutlined />;
color = "cyan";
break;
case "UNQUALIFIED":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <PlayCircleOutlined />;
color = "red";
break;
case "QUALIFIED":
case "NEGOTIATION":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <PlayCircleFilled />;
color = "green";
break;
case "LOST":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <PlayCircleFilled />;
color = "red";
break;
case "WON":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <CheckCircleOutlined />;
color = "green";
break;
case "CHURNED":
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon = <MinusCircleOutlined />;
color = "red";
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ const variant: Record<
> = {
DRAFT: {
color: "blue",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <ExpandOutlined />,
},
SENT: {
color: "cyan",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <SendOutlined />,
},
ACCEPTED: {
color: "green",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <CheckCircleOutlined />,
},
};
Expand Down
3 changes: 3 additions & 0 deletions examples/app-crm-minimal/src/config/resources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const resources: IResourceItem[] = [
list: "/",
meta: {
label: "Dashboard",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <DashboardOutlined />,
},
},
Expand All @@ -23,6 +24,7 @@ export const resources: IResourceItem[] = [
edit: "/companies/edit/:id",
meta: {
label: "Companies",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <ShopOutlined />,
},
},
Expand All @@ -33,6 +35,7 @@ export const resources: IResourceItem[] = [
edit: "/tasks/edit/:id",
meta: {
label: "Tasks",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <ProjectOutlined />,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export const CompanyContactsTable = () => {
bodyStyle={{ padding: 0 }}
title={
<Space size="middle">
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<TeamOutlined />
<Text>Contacts</Text>
</Space>
Expand Down Expand Up @@ -110,6 +111,7 @@ export const CompanyContactsTable = () => {
</Space>
);
}}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
filterIcon={<SearchOutlined />}
filterDropdown={(props) => (
<FilterDropdown {...props}>
Expand All @@ -120,6 +122,7 @@ export const CompanyContactsTable = () => {
<Table.Column
title="Title"
dataIndex="jobTitle"
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
filterIcon={<SearchOutlined />}
filterDropdown={(props) => (
<FilterDropdown {...props}>
Expand Down Expand Up @@ -153,11 +156,13 @@ export const CompanyContactsTable = () => {
<Button
size="small"
href={`mailto:${record.email}`}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<MailOutlined />}
/>
<Button
size="small"
href={`tel:${record.phone}`}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<PhoneOutlined />}
/>
</Space>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export const CompanyListPage = ({ children }: React.PropsWithChildren) => {
dataIndex="name"
title="Company title"
defaultFilteredValue={getDefaultFilter("id", filters)}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
filterIcon={<SearchOutlined />}
filterDropdown={(props) => (
<FilterDropdown {...props}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const DashboardDealsChart = () => {
gap: "8px",
}}
>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<DollarOutlined />
<Text size="sm" style={{ marginLeft: ".5rem" }}>
Deals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const DashboardLatestActivities = ({ limit = 5 }: Props) => {
gap: "8px",
}}
>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<UnorderedListOutlined />
<Text size="sm" style={{ marginLeft: ".5rem" }}>
Latest activities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const variants: {
secondaryColor: "#BAE0FF",
icon: (
<IconWrapper color="#E6F4FF">
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<ShopOutlined
className="md"
style={{
Expand Down Expand Up @@ -191,6 +192,7 @@ const variants: {
secondaryColor: "#D9F7BE",
icon: (
<IconWrapper color="#F6FFED">
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<TeamOutlined
className="md"
style={{
Expand Down Expand Up @@ -232,6 +234,7 @@ const variants: {
secondaryColor: "#FFD8BF",
icon: (
<IconWrapper color="#FFF2E8">
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<AuditOutlined
className="md"
style={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const CalendarUpcomingEvents = () => {
gap: "8px",
}}
>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<CalendarOutlined />
<Text size="sm" style={{ marginLeft: ".7rem" }}>
Upcoming events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const KanbanAddCardButton = ({
return (
<Button
size="large"
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<PlusSquareOutlined className="md" />}
style={{
margin: "16px",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export const StageForm = ({ isLoading }: Props) => {
{...formProps}
>
<Space size={5}>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<FlagOutlined />
<Form.Item
noStyle
Expand Down
3 changes: 3 additions & 0 deletions examples/app-crm-minimal/src/routes/tasks/edit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export const TasksEditPage = () => {
setActive={setActiveKey}
fallback={<DescriptionHeader description={description} />}
isLoading={isLoading}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<AlignLeftOutlined />}
label="Description"
>
Expand All @@ -80,6 +81,7 @@ export const TasksEditPage = () => {
setActive={setActiveKey}
fallback={<DueDateHeader dueData={dueDate} />}
isLoading={isLoading}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<FieldTimeOutlined />}
label="Due date"
>
Expand All @@ -94,6 +96,7 @@ export const TasksEditPage = () => {
setActive={setActiveKey}
fallback={<UsersHeader users={users} />}
isLoading={isLoading}
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<UsergroupAddOutlined />}
label="Users"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const ProjectCard = ({
{
label: "View card",
key: "1",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <EyeOutlined />,
onClick: () => {
edit("tasks", id, "replace");
Expand All @@ -62,6 +63,7 @@ export const ProjectCard = ({
danger: true,
label: "Delete card",
key: "2",
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon: <DeleteOutlined />,
onClick: () => {
mutate({
Expand Down Expand Up @@ -127,6 +129,7 @@ export const ProjectCard = ({
type="text"
shape="circle"
icon={
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<MoreOutlined
style={{
transform: "rotate(90deg)",
Expand Down Expand Up @@ -159,6 +162,7 @@ export const ProjectCard = ({
{dueDateOptions && (
<Tag
icon={
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<ClockCircleOutlined
style={{
fontSize: "12px",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export const KanbanColumn = ({
</Space>
<Button
shape="circle"
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
icon={<PlusOutlined />}
onClick={onAddClickHandler}
/>
Expand Down Expand Up @@ -125,13 +126,15 @@ export const KanbanColumnSkeleton = ({ children }: React.PropsWithChildren) => {
type="text"
shape="circle"
icon={
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<MoreOutlined
style={{
transform: "rotate(90deg)",
}}
/>
}
/>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<Button disabled shape="circle" icon={<PlusOutlined />} />
</Space>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/app-crm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test": "jest --passWithNoTests --runInBand"
},
"dependencies": {
"@ant-design/icons": "^5.0.1",
"@ant-design/icons": "5.0.1",
"@ant-design/plots": "^1.2.5",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/modifiers": "^6.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export const CalendarUpcomingEvents: React.FC<CalendarUpcomingEventsProps> = ({
gap: "8px",
}}
>
{/* @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66 */}
<CalendarOutlined />
<Text size="sm" style={{ marginLeft: ".7rem" }}>
Upcoming events
Expand All @@ -117,6 +118,7 @@ export const CalendarUpcomingEvents: React.FC<CalendarUpcomingEventsProps> = ({
}
extra={
showGoToListButton && (
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<Button onClick={() => list("events")} icon={<RightCircleOutlined />}>
See calendar
</Button>
Expand Down
1 change: 1 addition & 0 deletions examples/app-crm/src/components/icon/TextIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ export const TextIconSvg = () => (
);

export const TextIcon = (props: Partial<CustomIconComponentProps>) => (
// @ts-expect-error Ant Design Icon's v5.0.1 has an issue with @types/react@^18.2.66
<Icon component={TextIconSvg} {...props} />
);