bump 2.0.0-beta.8

tangjinzhou · tangjinzhou · commit f84065dcd3e7 · 2020-09-08T13:33:55.000+08:00
fix: types error
diff --git a/.eslintignore b/.eslintignore
@@ -7,4 +7,3 @@ es/
 lib/
 _site/
 dist/
-types/
diff --git a/.eslintrc b/.eslintrc
@@ -19,6 +19,14 @@
       "rules": {
         "no-console": "off"
       }
+    },
+    {
+      "files": ["**/types/**/*.ts"],
+      "extends": ["@vue/typescript/recommended"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/ban-types": 0
+      }
     }
   ],
   "rules": {
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -10,6 +10,10 @@
 
 ---
 
+## 2.0.0-beta.8
+
+- 🐞 Fix ts types error
+
 ## 2.0.0-beta.7
 
 - 🐞 Fix the problem that Descriptions Item does not support v-for [#2793](https://github.com/vueComponent/ant-design-vue/issues/2793)
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -10,6 +10,10 @@
 
 ---
 
+## 2.0.0-beta.8
+
+- 🐞 修复 ts 类型错误
+
 ## 2.0.0-beta.7
 
 - 🐞 修复 Descriptions Item 不支持 v-for 问题 [#2793](https://github.com/vueComponent/ant-design-vue/issues/2793)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [
@@ -41,6 +41,7 @@
     "pretty-quick": "pretty-quick",
     "dist": "node antd-tools/cli/run.js dist",
     "lint": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./components",
+    "lint:types": "eslint -c ./.eslintrc --fix --ext .ts ./types",
     "lint:site": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./antdv-demo",
     "lint:docs": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue,.md ./antdv-demo/docs/**/demo/**",
     "lint:style": "stylelint \"{site,components}/**/*.less\" --syntax less",
@@ -78,9 +79,12 @@
     "@commitlint/cli": "^8.0.0",
     "@commitlint/config-conventional": "^8.0.0",
     "@octokit/rest": "^16.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.1.0",
+    "@typescript-eslint/parser": "^4.1.0",
     "@vue/babel-plugin-jsx": "^1.0.0-rc.2",
     "@vue/cli-plugin-eslint": "^4.0.0",
     "@vue/compiler-sfc": "^3.0.0-rc.5",
+    "@vue/eslint-config-typescript": "^5.1.0",
     "@vue/server-test-utils": "1.0.0-beta.16",
     "@vue/test-utils": "^2.0.0-beta.2",
     "acorn": "^7.0.0",
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "module": "esnext",
+    "target": "esnext",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "esModuleInterop": true
+  },
+  "include": ["./types"],
+  "exclude": ["node_modules", "build", "scripts", "components", "webpack", "jest"]
+}
diff --git a/types/breadcrumb/breadcrumb-item.d.ts b/types/breadcrumb/breadcrumb-item.d.ts
@@ -9,7 +9,7 @@ export declare class BreadcrumbItem extends AntdComponent {
      * @default ''
      * @type string
      */
-    href?: String;
+    href?: string;
     overlay?: any;
   };
 }
diff --git a/types/breadcrumb/breadcrumb.d.ts b/types/breadcrumb/breadcrumb.d.ts
@@ -8,8 +8,8 @@ import { BreadcrumbSeparator } from './breadcrumb-separator';
 import { AntdComponent, AntdProps } from '../component';
 
 export interface Route {
-  path?: String;
-  breadcrumbName?: String;
+  path?: string;
+  breadcrumbName?: string;
   children?: Route[];
 }
 
diff --git a/types/button/button.d.ts b/types/button/button.d.ts
@@ -6,71 +6,72 @@ import { ButtonGroup } from './button-group';
 import { VNodeChild } from 'vue';
 import { AntdComponent, AntdProps } from '../component';
 
-export declare class Button extends AntdComponent {
-  static Group: typeof ButtonGroup;
+export interface ButtonProps extends AntdProps {
+  /**
+   * can be set to primary ghost dashed danger(added in 2.7) or omitted (meaning default)
+   * @default 'default'
+   * @type string
+   */
+  type?: 'primary' | 'danger' | 'dashed' | 'ghost' | 'default';
 
-  $props: AntdProps & {
-    /**
-     * can be set to primary ghost dashed danger(added in 2.7) or omitted (meaning default)
-     * @default 'default'
-     * @type string
-     */
-    type?: 'primary' | 'danger' | 'dashed' | 'ghost' | 'default';
+  /**
+   * set the original html type of button
+   * @default 'button'
+   * @type string
+   */
+  htmlType?: 'button' | 'submit' | 'reset' | 'menu';
 
-    /**
-     * set the original html type of button
-     * @default 'button'
-     * @type string
-     */
-    htmlType?: 'button' | 'submit' | 'reset' | 'menu';
+  /**
+   * set the icon of button
+   * @type string
+   */
+  icon?: VNodeChild | JSX.Element;
 
-    /**
-     * set the icon of button
-     * @type string
-     */
-    icon?: VNodeChild | JSX.Element;
+  /**
+   * can be set to circle or circle-outline or omitted
+   * @type string
+   */
+  shape?: 'circle' | 'circle-outline';
 
-    /**
-     * can be set to circle or circle-outline or omitted
-     * @type string
-     */
-    shape?: 'circle' | 'circle-outline';
+  /**
+   * can be set to small large or omitted
+   * @default 'default'
+   * @type string
+   */
+  size?: 'small' | 'large' | 'default';
 
-    /**
-     * can be set to small large or omitted
-     * @default 'default'
-     * @type string
-     */
-    size?: 'small' | 'large' | 'default';
+  /**
+   * set the loading status of button
+   * @default false
+   * @type boolean | { delay: number }
+   */
+  loading?: boolean | { delay: number };
 
-    /**
-     * set the loading status of button
-     * @default false
-     * @type boolean | { delay: number }
-     */
-    loading?: boolean | { delay: number };
+  /**
+   * disabled state of button
+   * @default false
+   * @type boolean
+   */
+  disabled?: boolean;
 
-    /**
-     * disabled state of button
-     * @default false
-     * @type boolean
-     */
-    disabled?: boolean;
+  /**
+   * make background transparent and invert text and border colors, added in 2.7
+   * @default false
+   * @type boolean
+   */
+  ghost?: boolean;
 
-    /**
-     * make background transparent and invert text and border colors, added in 2.7
-     * @default false
-     * @type boolean
-     */
-    ghost?: boolean;
+  /**
+   * option to fit button width to its parent width
+   * @default false
+   * @type boolean
+   */
+  block?: boolean;
 
-    /**
-     * option to fit button width to its parent width
-     * @default false
-     * @type boolean
-     */
-    block?: boolean;
+  onClick?: (e?: Event) => void;
+}
 
-    onClick?: (e?: Event) => void;
-  };
+export declare class Button extends AntdComponent {
+  static Group: typeof ButtonGroup;
+  $props: ButtonProps;
 }
diff --git a/types/component.d.ts b/types/component.d.ts
@@ -8,4 +8,4 @@ export declare class AntdComponent {
   static install(app: App): void;
 }
 
-export interface AntdProps extends HTMLAttributes {}
+export type AntdProps = HTMLAttributes
diff --git a/types/date-picker/common.d.ts b/types/date-picker/common.d.ts
@@ -4,7 +4,7 @@
 
 import { Moment } from 'moment';
 import { VNodeChild } from 'vue';
-import { AntdComponent, AntdProps } from '../component';
+import { AntdComponent } from '../component';
 
 export declare class DatepickerProps {
   /**
diff --git a/types/layout/layout-footer.d.ts b/types/layout/layout-footer.d.ts
@@ -1,4 +1,3 @@
-import { CSSProperties } from 'vue';
 // Project: https://github.com/vueComponent/ant-design-vue
 // Definitions by: Pythonfo <https://github.com/Pythonfo>
 // Copy from: akki-jat <https://github.com/akki-jat>
diff --git a/types/layout/layout-header.d.ts b/types/layout/layout-header.d.ts
@@ -1,4 +1,3 @@
-import { CSSProperties } from 'vue';
 // Project: https://github.com/vueComponent/ant-design-vue
 // Definitions by: Pythonfo <https://github.com/Pythonfo>
 // Copy from: akki-jat <https://github.com/akki-jat>
diff --git a/types/layout/layout-sider.d.ts b/types/layout/layout-sider.d.ts
@@ -1,4 +1,4 @@
-import { CSSProperties, Slot, VNodeChild } from 'vue';
+import { VNodeChild } from 'vue';
 // Project: https://github.com/vueComponent/ant-design-vue
 // Definitions by: akki-jat <https://github.com/akki-jat>
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
diff --git a/types/layout/layout.d.ts b/types/layout/layout.d.ts
@@ -7,7 +7,6 @@ import { LayoutSider } from './layout-sider';
 import LayoutHeader from './layout-header';
 import LayoutContent from './layout-content';
 import LayoutFooter from './layout-footer';
-import { CSSProperties } from 'vue';
 
 export interface LayoutProps {
   /**
diff --git a/types/menu/sub-menu.d.ts b/types/menu/sub-menu.d.ts
@@ -3,7 +3,6 @@
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
 import { AntdComponent, AntdProps } from '../component';
-import { MenuItem } from './menu-item';
 import { VNodeChild } from 'vue';
 
 export declare class SubMenu extends AntdComponent {
diff --git a/types/modal.d.ts b/types/modal.d.ts
@@ -3,9 +3,8 @@
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
 import { AntdComponent, AntdProps } from './component';
-import { VNode, CSSProperties, VNodeChild } from 'vue';
-import { TreeNode } from './tree-node';
-import { Button } from './button/button';
+import { CSSProperties, VNodeChild } from 'vue';
+import { ButtonProps } from './button/button';
 
 export interface ModalOptions {
   /**
@@ -43,7 +42,7 @@ export interface ModalOptions {
   /**
    * custom icon (Added in 1.14.0)
    */
-  icon?: VNode | Function;
+  icon?: VNodeChild | JSX.Element | function;
   /**
    * Whether show mask or not.
    * @default true
@@ -82,13 +81,13 @@ export interface ModalOptions {
    * The ok button props
    * @type object
    */
-  okButtonProps?: Button.$props;
+  okButtonProps?: ButtonProps;
 
   /**
    * The cancel button props
    * @type object
    */
-  cancelButtonProps?: Button.$props;
+  cancelButtonProps?: ButtonProps;
 
   /**
    * Title
@@ -133,10 +132,6 @@ export interface ModalOptions {
    * @type Function
    */
   onOk?: () => any;
-  /**
-   * The parent context of the popup is generally used to get the parent provider, such as the configuration of ConfigProvider
-   */
-  parentContext?: object;
 }
 
 export interface ModalConfirm {
@@ -259,13 +254,13 @@ export declare class Modal extends AntdComponent {
      * The ok button props, follow jsx rules
      * @type object
      */
-    okButtonProps?: Button.$props;
+    okButtonProps?: ButtonProps;
 
     /**
      * The cancel button props, follow jsx rules
      * @type object
      */
-    cancelButtonProps?: Button.$props;
+    cancelButtonProps?: ButtonProps;
 
     /**
      * The modal dialog's title
diff --git a/types/table/column.d.ts b/types/table/column.d.ts
@@ -2,7 +2,7 @@
 // Definitions by: akki-jat <https://github.com/akki-jat>
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
-import { VNodeChild, Slots } from 'vue';
+import { VNodeChild } from 'vue';
 import { AntdComponent, AntdProps } from '../component';
 
 export interface ColumnFilterItem {
diff --git a/types/type.ts b/types/type.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 // 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;

-Original file line number
+Diff line change
 lib/
 _site/
 dist/
 -types/
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export declare class BreadcrumbItem extends AntdComponent {`
`9`	`9`	`* @default ''`
`10`	`10`	`* @type string`
`11`	`11`	`*/`
`12`		`- href?: String;`
	`12`	`+ href?: string;`
`13`	`13`	`overlay?: any;`
`14`	`14`	`};`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import { BreadcrumbSeparator } from './breadcrumb-separator';`
`8`	`8`	`import { AntdComponent, AntdProps } from '../component';`
`9`	`9`
`10`	`10`	`export interface Route {`
`11`		`- path?: String;`
`12`		`- breadcrumbName?: String;`
	`11`	`+ path?: string;`
	`12`	`+ breadcrumbName?: string;`
`13`	`13`	`children?: Route[];`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ export declare class AntdComponent {`
`8`	`8`	`static install(app: App): void;`
`9`	`9`	`}`
`10`	`10`
`11`		`-export interface AntdProps extends HTMLAttributes {}`
	`11`	`+export type AntdProps = HTMLAttributes`