Compare commits

...

4 Commits

Author SHA1 Message Date
二货机器人
6d9cf9e132 chore: sync script with next 2022-11-17 16:48:50 +08:00
二货爱吃白萝卜
14884fe585 docs: 4.24.3 changelog (#38623) 2022-11-17 16:41:24 +08:00
MadCcc
17c7526728 Merge pull request #38577 from ant-design/master
chore: sync 4.x
2022-11-17 14:50:17 +08:00
MadCcc
bfe8183e1c chore: update deploy actions & scripts 2022-11-15 10:54:19 +08:00
5 changed files with 51 additions and 17 deletions

View File

@@ -10,7 +10,7 @@ permissions:
jobs:
setup:
runs-on: ubuntu-latest
if: github.event.ref_type == 'tag' && (contains(github.event.ref, '-') == false)
if: github.event.ref_type == 'tag' && (contains(github.event.ref, '-') == false || startsWith(github.event.ref, '4.'))
steps:
- name: checkout
uses: actions/checkout@v3
@@ -66,5 +66,6 @@ jobs:
- name: deploy
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
deploy_key: ${{ secrets.SITE_4X_DEPLOY_KEY }}
external_repository: ant-design/4x.ant.design
publish_dir: ./_site

View File

@@ -15,6 +15,16 @@ timeline: true
---
## 4.24.3
`2022-11-17`
- 🐞 Fix Typography config `prefixCls` not working. [#38586](https://github.com/ant-design/ant-design/pull/38586) [@SavelevMatthew](https://github.com/SavelevMatthew)
- 🐞 Fix Table should not trigger sorter when pressing Enter in filter dropdown. [#38585](https://github.com/ant-design/ant-design/pull/38585)
- 🆕 Allow Modal pass `mousePosition` to control animation origin position. [#38584](https://github.com/ant-design/ant-design/pull/38584) [@kiner-tang](https://github.com/kiner-tang)
- 🐞 Fix Input.Search should not trigger `onSearch` while loading. [#38578](https://github.com/ant-design/ant-design/pull/38578) [@JackLiR8](https://github.com/JackLiR8)
- 🐞 Fix Breadcrumb throw wrong `overlay` deprecated warning. [#38567](https://github.com/ant-design/ant-design/pull/38567) [@li-jia-nan](https://github.com/li-jia-nan)
## 4.24.2
`2022-11-12`

View File

@@ -15,6 +15,16 @@ timeline: true
---
## 4.24.3
`2022-11-17`
- 🐞 修复 Typography 设置 `prefixCls` 不生效的问题。[#38586](https://github.com/ant-design/ant-design/pull/38586) [@SavelevMatthew](https://github.com/SavelevMatthew)
- 🐞 修复 Table 在筛选菜单里按回车时会触发排序的问题。[#38585](https://github.com/ant-design/ant-design/pull/38585)
- 🆕 Modal 允许透传 `mousePosition` 来控制弹框动画原点。[#38584](https://github.com/ant-design/ant-design/pull/38584) [@kiner-tang](https://github.com/kiner-tang)
- 🐞 修复 Input.Search `loading` 时触发 `onSearch` 的问题。[#38578](https://github.com/ant-design/ant-design/pull/38578) [@JackLiR8](https://github.com/JackLiR8)
- 🐞 修复 Breadcrumb 报出错误的 `overlay` 警告信息的问题。[#38567](https://github.com/ant-design/ant-design/pull/38567) [@li-jia-nan](https://github.com/li-jia-nan)
## 4.24.2
`2022-11-12`

View File

@@ -1,6 +1,6 @@
{
"name": "antd",
"version": "4.24.2",
"version": "4.24.3",
"description": "An enterprise-class UI design language and React components implementation",
"title": "Ant Design",
"keywords": [
@@ -64,7 +64,7 @@
"compile": "npm run clean && antd-tools run compile",
"changelog": "node ./scripts/print-changelog",
"predeploy": "antd-tools run clean && npm run site && cp CNAME _site && npm run site:test",
"deploy": "bisheng gh-pages --push-only --dotfiles",
"deploy": "gh-pages -d _site -r git@github.com:ant-design/4x.ant.design.git -b gh-pages",
"deploy:china-mirror": "git checkout gh-pages && git pull origin gh-pages && git push git@gitee.com:ant-design/ant-design.git gh-pages",
"dist": "antd-tools run dist",
"dist:esbuild": "ESBUILD=true npm run dist",

View File

@@ -15,18 +15,27 @@ function exitProcess(code = 1) {
}
async function checkVersion() {
const { versions } = await fetch('http://registry.npmjs.org/antd').then(res => res.json());
if (version in versions) {
console.log(chalk.yellow('😈 Current version already exists. Forget update package.json?'));
console.log(chalk.cyan(' => Current:'), version);
exitProcess();
try {
const { versions } = await fetch('http://registry.npmjs.org/antd').then((res) => res.json());
if (version in versions) {
console.log(chalk.yellow('😈 Current version already exists. Forget update package.json?'));
console.log(chalk.cyan(' => Current:'), version);
exitProcess();
}
} catch (error) {
console.log(chalk.red('🚨 Check version failed. Skip...'));
}
}
async function checkBranch({ current }) {
if (version.includes('-alpha.')) {
if (
version.includes('-alpha.') ||
version.includes('-beta.') ||
version.includes('-rc.') ||
version.includes('-experimental.')
) {
console.log(chalk.cyan('😃 Alpha version. Skip branch check.'));
} else if (current !== 'master' && current !== '4.0-prepare') {
} else if (current !== 'master' && current !== '4.0-prepare' && current !== '4.x-stable') {
console.log(chalk.yellow('🤔 You are not in the master branch!'));
exitProcess();
}
@@ -43,12 +52,16 @@ async function checkCommit({ files }) {
}
async function checkRemote() {
const { remote } = await git.fetch('origin', 'master');
if (remote?.indexOf('ant-design/ant-design') === -1) {
console.log(
chalk.yellow('😓 Your remote origin is not ant-design/ant-design, did you fork it?'),
);
exitProcess();
try {
const { remote } = await git.fetch('origin', 'master');
if (remote?.indexOf('ant-design/ant-design') === -1) {
console.log(
chalk.yellow('😓 Your remote origin is not ant-design/ant-design, did you fork it?'),
);
exitProcess();
}
} catch (error) {
console.log(chalk.red('🚨 Check remote failed. Skip...'));
}
}