Merge pull request #998 from youluna/fix-warning-and-ts

Add d.ts. for locale & prevent some warning
alibaba-fusion · Aug 13, 2019 · 16c9cfe · 16c9cfe
2 parents cf66a80 + e1801b6
commit 16c9cfe
Show file tree

Hide file tree

Showing 15 changed files with 149 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -47,13 +47,13 @@
     "test:a11y": "node --max_old_space_size=8192 ./scripts/test/a11y-index.js",
     "order-var": "node ./scripts/order-var.js",
     "eslint": "eslint '@(src|scripts)/**/*.@(js|jsx)' && eslint --fix 'docs/**/@(demo|theme)/*.@(md)'",
-    "tslint": "tsc types/**/*.d.ts",
+    "tslint": "tsc",
     "prettierjs": "prettier --write '@(src|test|scripts)/**/*.@(js|jsx)'",
     "stylelint": "stylelint --fix 'src/**/*.@(css|scss)'",
     "commitmsg": "commitlint -E GIT_PARAMS",
     "precommit": "lint-staged",
     "changelog": "node ./scripts/changelog.js",
-    "prepub": "npm run tslint && npm run eslint && npm run stylelint && npm run changelog && npm run build && npm run check &&  npm run docs && npm run pack && npm run pack -- minimize && npm run pack-adaptor"
+    "prepub": "npm run tslint && npm run eslint && npm run stylelint && npm run changelog && npm run build && npm run tslint && npm run check &&  npm run docs && npm run pack && npm run pack -- minimize && npm run pack-adaptor"
   },
   "lint-staged": {
     "types/**/*.d.ts": [
@@ -83,7 +83,7 @@
   "devDependencies": {
     "@alifd/adaptor-generate": "^0.2.3",
     "@alifd/adaptor-helper": "^0.1.3",
-    "@alifd/api-extractor": "^3.5.1",
+    "@alifd/api-extractor": "^3.5.2",
     "@alifd/babel-preset-next": "^2.0.0",
     "@alifd/doc-parser": "^1.0.0",
     "@alifd/dts-generator": "^1.0.3",

diff --git a/scripts/build/export-api-schema.js b/scripts/build/export-api-schema.js
@@ -61,7 +61,9 @@ module.exports = function(options) {
             fs.writeFileSync(apiPath, apiString);
             fs.writeFileSync(
                 exportDTSPath,
-                `export * from '../../types/${shortName}';
+                `import ${apiInfo.name} from '../../types/${shortName}';
+export * from '../../types/${shortName}';
+export default ${apiInfo.name};
 `
             );
             // tsgen(apiInfo).then(apiData => {
@@ -72,6 +74,15 @@ module.exports = function(options) {
         }
     });
 
+    // generate d.ts for locale
+    ['zh-cn', 'en-us', 'ja-jp', 'zh-tw'].forEach(file => {
+        const localePath = path.join(cwd, 'lib', 'locale', `${file}.d.ts`);
+        fs.writeFileSync(
+            localePath,
+            `export * from '../../types/locale/${file}';`
+        );
+    });
+
     // hack Field
     entries.push('export const Field: any;');
 

diff --git a/src/balloon/inner.jsx b/src/balloon/inner.jsx
@@ -92,7 +92,6 @@ class BalloonInner extends React.Component {
                         role="button"
                         aria-label={locale.close}
                         tabIndex="0"
-                        href="javascript:void(0);"
                         className={`${_prefix}-close`}
                         onClick={onClose}
                     >

diff --git a/src/dialog/inner.jsx b/src/dialog/inner.jsx
@@ -149,7 +149,6 @@ export default class Inner extends Component {
                 <a
                     role="button"
                     aria-label={locale.close}
-                    href="javascript:;"
                     className={`${prefix}dialog-close`}
                     onClick={onClose}
                 >

diff --git a/src/drawer/inner.jsx b/src/drawer/inner.jsx
@@ -11,7 +11,7 @@ export default class Inner extends Component {
         className: PropTypes.string,
         closeable: PropTypes.bool,
         role: PropTypes.string,
-        placement: PropTypes.oneOfType(['top', 'right', 'bottom', 'left']),
+        placement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
         rtl: PropTypes.bool,
     };
 

diff --git a/src/message/message.jsx b/src/message/message.jsx
@@ -161,7 +161,6 @@ class Message extends Component {
                     <a
                         role="button"
                         aria-label={locale.closeAriaLabel}
-                        href="javascript:;"
                         className={`${messagePrefix}-close`}
                         onClick={this.onClose}
                     >

diff --git a/src/table/base/sort.jsx b/src/table/base/sort.jsx
@@ -30,7 +30,6 @@ export default class Sort extends React.Component {
         const icons = ['asc', 'desc'].map(sortOrder => {
             return (
                 <a
-                    href="javascript:;"
                     key={sortOrder}
                     className={sortStatus === sortOrder ? 'current' : ''}
                 >

diff --git a/src/table/list/row.jsx b/src/table/list/row.jsx
@@ -31,6 +31,7 @@ export default class GroupListRow extends Row {
             cellRef,
             getCellProps,
             locale,
+            wrapper,
             rtl,
             ...others
         } = this.props;

diff --git a/types/tsconfig.json → tsconfig.json b/types/tsconfig.json → tsconfig.json
@@ -5,5 +5,5 @@
       "removeComments": true,
       "sourceMap": true
     },
-   "include": ["types/**/*"]
+    "exclude": ["node_modules"]
 }
diff --git a/types/config-provider/index.d.ts b/types/config-provider/index.d.ts
@@ -43,7 +43,7 @@ export interface ConfigProviderProps {
     /**
      * 设备类型，针对不同的设备类型组件做出对应的响应式变化
      */
-    device: 'tablet' | 'desktop' | 'phone',
+    device?: 'tablet' | 'desktop' | 'phone',
     /**
      * 组件树
      */

diff --git a/types/locale/default.d.ts b/types/locale/default.d.ts
@@ -0,0 +1,126 @@
+export interface locale {
+    momentLocale: string;
+    Timeline: {
+        expand: string;
+        fold: string;
+    };
+    Balloon: {
+        close: string;
+    };
+    Card: {
+        expand: string;
+        fold: string;
+    };
+    Calendar: {
+        today: string;
+        now: string;
+        ok: string;
+        clear: string;
+        month: string;
+        year: string;
+        prevYear: string;
+        nextYear: string;
+        prevMonth: string;
+        nextMonth: string;
+        prevDecade: string;
+        nextDecade: string;
+        yearSelectAriaLabel: string;
+        monthSelectAriaLabel: string;
+    };
+    DatePicker: {
+        placeholder: string;
+        datetimePlaceholder: string;
+        monthPlaceholder: string;
+        yearPlaceholder: string;
+        now: string;
+        selectTime: string;
+        selectDate: string;
+        ok: string;
+        clear: string;
+        startPlaceholder: string;
+        endPlaceholder: string;
+        hour: string;
+        minute: string;
+        second: string;
+    };
+    Dialog: {
+        close: string;
+        ok: string;
+        cancel: string;
+    };
+    Message: {
+        closeAriaLabel: string;
+    };
+    Pagination: {
+        prev: string;
+        next: string;
+        goTo: string;
+        page: string;
+        go: string;
+        total: string;
+        labelPrev: string;
+        labelNext: string;
+        inputAriaLabel: string;
+        selectAriaLabel: string;
+        pageSize: string;
+    };
+    Input: {
+        clear: string;
+    };
+    Select: {
+        selectPlaceholder: string;
+        autoCompletePlaceholder: string;
+        notFoundContent: string;
+        maxTagPlaceholder: string;
+    };
+    Table: {
+        empty: string;
+        ok: string;
+        reset: string;
+        asc: string;
+        desc: string;
+        expanded: string;
+        folded: string;
+        filter: string;
+        selectAll: string;
+    };
+    TimePicker: {
+        placeholder: string;
+        clear: string;
+        hour: string;
+        minute: string;
+        second: string;
+    };
+    Transfer: {
+        items: string;
+        item: string;
+        moveAll: string;
+        searchPlaceholder: string;
+        moveToLeft: string;
+        moveToRight: string;
+    };
+    Upload: {
+        card: {
+            cancel: string;
+            addPhoto: string;
+            download: string;
+            delete: string;
+        };
+        drag: {
+            text: string;
+            hint: string;
+        };
+        upload: {
+            delete: string;
+        };
+    };
+    Search: {
+        buttonText: string;
+    };
+    Tag: {
+        delete: string;
+    };
+    Rating: {
+        description: string;
+    };
+}
diff --git a/types/locale/en-us.d.ts b/types/locale/en-us.d.ts
@@ -0,0 +1 @@
+export * from './default';
diff --git a/types/locale/ja-jp.d.ts b/types/locale/ja-jp.d.ts
@@ -0,0 +1 @@
+export * from './default';
diff --git a/types/locale/zh-cn.d.ts b/types/locale/zh-cn.d.ts
@@ -0,0 +1 @@
+export * from './default';
diff --git a/types/locale/zh-tw.d.ts b/types/locale/zh-tw.d.ts
@@ -0,0 +1 @@
+export * from './default';