Merge remote-tracking branch 'origin/main' into feat-v4

Author: tangjinzhou

antd-tools/getBabelCommonConfig.js

@@ -1,4 +1,4 @@
-const { resolve } = require('./utils/projectHelper');
+const { resolve, isThereHaveBrowserslistConfig } = require('./utils/projectHelper');
 
 module.exports = function (modules) {
   const plugins = [
@@ -39,9 +39,11 @@ module.exports = function (modules) {
         resolve('@babel/preset-env'),
         {
           modules,
-          targets: {
-            browsers: ['last 2 versions', 'Firefox ESR', '> 1%', 'ie >= 11'],
-          },
+          targets: isThereHaveBrowserslistConfig()
+            ? undefined
+            : {
+                browsers: ['last 2 versions', 'Firefox ESR', '> 1%', 'ie >= 11'],
+              },
         },
       ],
     ],

components/_util/type.ts

@@ -1,4 +1,5 @@
-import type { App, PropType, Plugin, Ref, VNode } from 'vue';
+// @ts-ignore
+import type { App, PropType, Plugin, Ref, VNode, SlotsType } from 'vue';
 
 // https://stackoverflow.com/questions/46176165/ways-to-get-string-literal-type-of-array-values-without-enum-overhead
 export const tuple = <T extends string[]>(...args: T) => args;
@@ -87,3 +88,5 @@ export function stringType<T extends string = string>(defaultVal?: T) {
 export function someType<T>(types?: any[], defaultVal?: T) {
   return types ? { type: types as PropType<T>, default: defaultVal as T } : anyType<T>(defaultVal);
 }
+
+export type CustomSlotsType<T> = SlotsType<T>;

components/anchor/AnchorLink.tsx

@@ -4,7 +4,7 @@ import { initDefaultProps } from '../_util/props-util';
 import classNames from '../_util/classNames';
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import { useInjectAnchor } from './context';
-import type { Key, VueNode } from '../_util/type';
+import type { Key, VueNode, CustomSlotsType } from '../_util/type';
 import { objectType, anyType } from '../_util/type';
 import type { CSSProperties } from '../_util/cssinjs/hooks/useStyleRegister';
 
@@ -33,7 +33,11 @@ export default defineComponent({
   name: 'AAnchorLink',
   inheritAttrs: false,
   props: initDefaultProps(anchorLinkProps(), { href: '#' }),
-  slots: ['title', 'customTitle'],
+  slots: Object as CustomSlotsType<{
+    title: any;
+    default: any;
+    customTitle: any;
+  }>,
   setup(props, { slots, attrs }) {
     let mergedTitle = null;
     const {

components/auto-complete/index.tsx

@@ -6,9 +6,12 @@ import warning from '../_util/warning';
 import Option from './Option';
 import OptGroup from './OptGroup';
 import omit from '../_util/omit';
+
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import type { InputStatus } from '../_util/statusUtils';
 
+import type { CustomSlotsType } from '../_util/type';
+
 function isSelectOptionOrSelectOptGroup(child: any): boolean {
   return child?.type?.isSelectOption || child?.type?.isSelectOptGroup;
 }
@@ -46,7 +49,12 @@ const AutoComplete = defineComponent({
   inheritAttrs: false,
   props: autoCompleteProps(),
   // emits: ['change', 'select', 'focus', 'blur'],
-  slots: ['option'],
+  slots: Object as CustomSlotsType<{
+    options: any;
+    default: any;
+    notFoundContent: any;
+    dataSource: any;
+  }>,
   setup(props, { slots, attrs, expose }) {
     warning(
       !('dataSource' in slots),

components/avatar/Avatar.tsx

@@ -1,4 +1,4 @@
-import type { VueNode } from '../_util/type';
+import type { CustomSlotsType, VueNode } from '../_util/type';
 
 import type { CSSProperties, ExtractPropTypes, PropType } from 'vue';
 import { computed, defineComponent, nextTick, onMounted, shallowRef, watch } from 'vue';
@@ -42,7 +42,10 @@ const Avatar = defineComponent({
   name: 'AAvatar',
   inheritAttrs: false,
   props: avatarProps(),
-  slots: ['icon'],
+  slots: Object as CustomSlotsType<{
+    icon: any;
+    default: any;
+  }>,
   setup(props, { slots, attrs }) {
     const isImgExist = shallowRef(true);
     const isMounted = shallowRef(false);

components/badge/Badge.tsx

@@ -11,7 +11,7 @@ import useConfigInject from '../config-provider/hooks/useConfigInject';
 import isNumeric from '../_util/isNumeric';
 import useStyle from './style';
 import type { PresetColorKey } from '../theme/interface';
-import type { LiteralUnion } from '../_util/type';
+import type { LiteralUnion, CustomSlotsType } from '../_util/type';
 import type { PresetStatusColorType } from '../_util/colors';
 import { isPresetColor } from '../_util/colors';
 
@@ -42,7 +42,11 @@ export default defineComponent({
   Ribbon,
   inheritAttrs: false,
   props: badgeProps(),
-  slots: ['text', 'count'],
+  slots: Object as CustomSlotsType<{
+    text: any;
+    count: any;
+    default: any;
+  }>,
   setup(props, { slots, attrs }) {
     const { prefixCls, direction } = useConfigInject('badge', props);
     const [wrapSSR, hashId] = useStyle(prefixCls);

components/badge/Ribbon.tsx

@@ -1,4 +1,4 @@
-import type { LiteralUnion } from '../_util/type';
+import type { CustomSlotsType, LiteralUnion } from '../_util/type';
 import type { PresetColorType } from '../_util/colors';
 import useStyle from './style';
 import { isPresetColor } from '../_util/colors';
@@ -21,7 +21,10 @@ export default defineComponent({
   name: 'ABadgeRibbon',
   inheritAttrs: false,
   props: ribbonProps(),
-  slots: ['text'],
+  slots: Object as CustomSlotsType<{
+    text: any;
+    default: any;
+  }>,
   setup(props, { attrs, slots }) {
     const { prefixCls, direction } = useConfigInject('ribbon', props);
     const [wrapSSR, hashId] = useStyle(prefixCls);

components/breadcrumb/Breadcrumb.tsx

@@ -6,9 +6,10 @@ import warning from '../_util/warning';
 import type { BreadcrumbItemProps } from './BreadcrumbItem';
 import BreadcrumbItem from './BreadcrumbItem';
 import Menu from '../menu';
-import type { VueNode } from '../_util/type';
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import useStyle from './style';
+import type { CustomSlotsType, VueNode } from '../_util/type';
+
 export interface Route {
   path: string;
   breadcrumbName: string;
@@ -57,7 +58,11 @@ export default defineComponent({
   name: 'ABreadcrumb',
   inheritAttrs: false,
   props: breadcrumbProps(),
-  slots: ['separator', 'itemRender'],
+  slots: Object as CustomSlotsType<{
+    separator: any;
+    itemRender: { route: Route; params: any; routes: Route[]; paths: string[] };
+    default: any;
+  }>,
   setup(props, { slots, attrs }) {
     const { prefixCls, direction } = useConfigInject('breadcrumb', props);
     const [wrapSSR, hashId] = useStyle(prefixCls);

components/breadcrumb/BreadcrumbItem.tsx

@@ -8,6 +8,7 @@ import DownOutlined from '@ant-design/icons-vue/DownOutlined';
 import useConfigInject from '../config-provider/hooks/useConfigInject';
 import type { MouseEventHandler } from '../_util/EventInterface';
 import { eventType, objectType } from '../_util/type';
+import type { CustomSlotsType } from '../_util/type';
 
 export const breadcrumbItemProps = () => ({
   prefixCls: String,
@@ -26,7 +27,11 @@ export default defineComponent({
   __ANT_BREADCRUMB_ITEM: true,
   props: breadcrumbItemProps(),
   // emits: ['click'],
-  slots: ['separator', 'overlay'],
+  slots: Object as CustomSlotsType<{
+    separator: any;
+    overlay: any;
+    default: any;
+  }>,
   setup(props, { slots, attrs, emit }) {
     const { prefixCls } = useConfigInject('breadcrumb', props);
     /**

components/button/button.tsx

@@ -20,6 +20,7 @@ import type { ButtonType } from './buttonTypes';
 import type { VNode } from 'vue';
 import { GroupSizeContext } from './button-group';
 import { useCompactItemContext } from '../space/Compact';
+import type { CustomSlotsType } from '../_util/type';
 
 type Loading = boolean | number;
 
@@ -36,7 +37,10 @@ export default defineComponent({
   inheritAttrs: false,
   __ANT_BUTTON: true,
   props: initDefaultProps(buttonProps(), { type: 'default' }),
-  slots: ['icon'],
+  slots: Object as CustomSlotsType<{
+    icon: any;
+    default: any;
+  }>,
   // emits: ['click', 'mousedown'],
   setup(props, { slots, attrs, emit, expose }) {
     const { prefixCls, autoInsertSpaceInButton, direction, size } = useConfigInject('btn', props);