Skip to content

Commit

Permalink
Merge pull request #48927 from ant-design/master-merge-feature
Browse files Browse the repository at this point in the history
chore: merge master into feature
  • Loading branch information
MadCcc committed May 14, 2024
2 parents f912fa0 + 45caacd commit 05f587a
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/mock-project-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,9 @@ jobs:
if: ${{ failure() }}
with:
notice-types: 'dingding'
# Exit directly with non-zero to trigger the failure logic of ci-notice.
ci: |
echo "❌ CI Mock Project Build Failed"
exit 1
dingding-token: ${{ secrets.DINGDING_BOT_COLLABORATOR_TOKEN }}
notice-title: 'CI Mock Project Build Failed'
3 changes: 2 additions & 1 deletion BUG_VERSIONS.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@
"5.14.0": ["https://github.com/ant-design/ant-design/issues/47354"],
"5.15.0": ["https://github.com/ant-design/ant-design/pull/47504#issuecomment-1980459433"],
">= 5.16.0 <= 5.16.1": ["https://github.com/ant-design/ant-design/issues/48200"],
"5.16.3": ["https://github.com/ant-design/ant-design/issues/48568"]
"5.16.3": ["https://github.com/ant-design/ant-design/issues/48568"],
"5.17.1": ["https://github.com/ant-design/ant-design/issues/48913"]
}
6 changes: 6 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ tag: vVERSION

---

## 5.17.2

`2024-05-14`

- 🐞 MISC: Fix `lib` bundle mistake deps on the `es` module which break the build progress. [#48914](https://github.com/ant-design/ant-design/pull/48914)

## 5.17.1

`2024-05-14`
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ tag: vVERSION

---

## 5.17.2

`2024-05-14`

- 🐞 MISC: 修复 `lib` 产物错误引入 `es` 依赖导致构建错误的问题。[#48914](https://github.com/ant-design/ant-design/pull/48914)

## 5.17.1

`2024-05-14`
Expand Down
10 changes: 2 additions & 8 deletions components/_util/wave/WaveEffect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import classNames from 'classnames';
import CSSMotion from 'rc-motion';
import raf from 'rc-util/lib/raf';
import { render, unmount } from 'rc-util/lib/React/render';
import { composeRef } from 'rc-util/es/ref';
import { composeRef } from 'rc-util/lib/ref';

import { TARGET_CLS } from './interface';
import type { ShowWaveEffect } from './interface';
Expand Down Expand Up @@ -129,13 +129,7 @@ const WaveEffect: React.FC<WaveEffectProps> = (props) => {
{({ className: motionClassName }, ref) => (
<div
ref={composeRef(divRef, ref)}
className={classNames(
className,
{
'wave-quick': isSmallComponent,
},
motionClassName,
)}
className={classNames(className, { 'wave-quick': isSmallComponent }, motionClassName)}
style={waveStyle}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion components/alert/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled';
import classNames from 'classnames';
import CSSMotion from 'rc-motion';
import { composeRef } from 'rc-util/es/ref';
import { composeRef } from 'rc-util/lib/ref';
import pickAttrs from 'rc-util/lib/pickAttrs';

import type { ClosableType } from '../_util/hooks/useClosable';
Expand Down
2 changes: 1 addition & 1 deletion components/float-button/BackTop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext, useEffect, useState } from 'react';
import VerticalAlignTopOutlined from '@ant-design/icons/VerticalAlignTopOutlined';
import classNames from 'classnames';
import CSSMotion from 'rc-motion';
import { composeRef } from 'rc-util/es/ref';
import { composeRef } from 'rc-util/lib/ref';

import getScroll from '../_util/getScroll';
import scrollTo from '../_util/scrollTo';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "antd",
"version": "5.17.1",
"version": "5.17.2",
"description": "An enterprise-class UI design language and React components implementation",
"keywords": [
"ant",
Expand Down

0 comments on commit 05f587a

Please sign in to comment.