chore: auto merge branches (#55699)

chore: feature merge master

.github/workflows/preview-build.yml

@@ -30,7 +30,7 @@ jobs:
       - name: run e2e test
         run: bun run test:site
       - name: upload site artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: site
           path: _site/
@@ -42,7 +42,7 @@ jobs:
 
       - name: Upload PR number
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: pr
           path: ./pr-id.txt

.github/workflows/site-deploy.yml

@@ -45,7 +45,7 @@ jobs:
           fi
 
       - name: upload site artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: real-site
           path: _site/

.github/workflows/test-v6.yml

@@ -76,7 +76,7 @@ jobs:
           mkdir persist-coverage
           mv coverage/coverage-final.json persist-coverage/react-test-${{matrix.module}}-${{strategy.job-index}}.json
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         name: upload coverages
         with:
           name: coverage-artifacts-${{ matrix.module }}-${{ strategy.job-index }}
@@ -179,7 +179,7 @@ jobs:
         run: bun run test:dekko
 
       # Artifact build files
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
           name: build artifacts

.github/workflows/test.yml

@@ -79,7 +79,7 @@ jobs:
           mkdir persist-coverage
           mv coverage/coverage-final.json persist-coverage/react-test-${{matrix.module}}-${{strategy.job-index}}.json
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         name: upload coverages
         with:
           name: coverage-artifacts-${{ matrix.module }}-${{ strategy.job-index }}
@@ -182,7 +182,7 @@ jobs:
         run: bun run test:dekko
 
       # Artifact build files
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
           name: build artifacts

.github/workflows/visual-regression-diff-build.yml

@@ -37,7 +37,7 @@ jobs:
         env:
           NODE_OPTIONS: --max_old_space_size=4096
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v4
         name: artifact snapshot
         with:
           name: snapshot-artifacts-${{ strategy.job-index }}
@@ -71,7 +71,7 @@ jobs:
 
       # Upload report in `visualRegressionReport`
       - name: upload report artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: visual-regression-report
@@ -85,7 +85,7 @@ jobs:
 
       - name: Upload persist key
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: visual-regression-diff-ref
           path: ./visual-regression-pr-id.txt

.github/workflows/visual-regression-persist-start.yml

@@ -31,7 +31,7 @@ jobs:
 
       # Upload `imageSnapshots` on master
       - name: upload report artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: image-snapshots
           path: imageSnapshots.tar.gz
@@ -43,7 +43,7 @@ jobs:
 
       - name: Upload persist key
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: visual-regression-ref
           path: ./visual-regression-ref.txt

components/index.ts

@@ -97,7 +97,7 @@ export type { MenuItemProps, MenuProps, MenuRef, MenuTheme, SubMenuProps } from
 export { default as message } from './message';
 export type { ArgsProps as MessageArgsProps } from './message';
 export { default as Modal } from './modal';
-export type { ModalFuncProps, ModalProps } from './modal';
+export type { ModalFuncProps, ModalProps, ModalLocale } from './modal';
 export { default as notification } from './notification';
 export type { ArgsProps as NotificationArgsProps } from './notification';
 export { default as Pagination } from './pagination';

components/locale/index.tsx

@@ -4,7 +4,7 @@ import type { ValidateMessages } from 'rc-field-form/lib/interface';
 import { devUseWarning } from '../_util/warning';
 import type { PickerLocale as DatePickerLocale } from '../date-picker/generatePicker';
 import type { TransferLocale as TransferLocaleForEmpty } from '../empty';
-import type { ModalLocale } from '../modal/locale';
+import type { ModalLocale } from '../modal/interface';
 import { changeConfirmLocale } from '../modal/locale';
 import type { PaginationLocale } from '../pagination/Pagination';
 import type { PopconfirmLocale } from '../popconfirm/PurePanel';

components/modal/locale.ts

@@ -1,10 +1,5 @@
 import defaultLocale from '../locale/en_US';
-
-export interface ModalLocale {
-  okText: string;
-  cancelText: string;
-  justOkText: string;
-}
+import type { ModalLocale } from './interface';
 
 let runtimeLocale: ModalLocale = {
   ...(defaultLocale.Modal as ModalLocale),