Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use father #268

Merged
merged 21 commits into from Aug 31, 2020
Merged
21 changes: 21 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,21 @@
const base = require("@umijs/fabric/dist/eslint");

module.exports = {
...base,
rules: {
...base.rules,
"react/no-array-index-key": 0,
"react/sort-comp": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-empty-interface": 0,
"@typescript-eslint/no-inferrable-types": 0,
"react/no-find-dom-node": 0,
"react/require-default-props": 0,
"no-confusing-arrow": 0,
"import/no-named-as-default-member": 0,
"jsx-a11y/label-has-for": 0,
"jsx-a11y/label-has-associated-control": 0,
"import/no-extraneous-dependencies": 0,
"no-underscore-dangle": 0,
},
};
9 changes: 9 additions & 0 deletions .fatherrc.js
@@ -0,0 +1,9 @@
export default {
cjs: "babel",
esm: { type: "babel", importLibToEs: true },
preCommit: {
eslint: true,
prettier: true,
},
runtimeHelpers: true,
};
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -30,3 +30,5 @@ es
package-lock.json
tmp/
.history
.storybook
.doc
6 changes: 6 additions & 0 deletions .prettierrc
@@ -0,0 +1,6 @@
{
"singleQuote": true,
"trailingComma": "all",
"proseWrap": "never",
"printWidth": 100
}
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -7,7 +7,7 @@ notifications:
- yiminghe@gmail.com

node_js:
- 6
- 10
kerm1it marked this conversation as resolved.
Show resolved Hide resolved

before_install:
- |
Expand All @@ -29,4 +29,5 @@ env:
matrix:
- TEST_TYPE=lint
- TEST_TYPE=test
- TEST_TYPE=coverage
- TEST_TYPE=coverage
- TEST_TYPE=compile
kerm1it marked this conversation as resolved.
Show resolved Hide resolved
Empty file removed examples/asyncAction.html
Empty file.
11 changes: 6 additions & 5 deletions examples/asyncAction.js → examples/asyncAction.tsx
@@ -1,11 +1,10 @@
/* eslint no-console:0 */
import React from 'react';
import ReactDOM from 'react-dom';
import Upload from 'rc-upload';
import Upload from '..';

const props = {
action: () => {
return new Promise((resolve) => {
return new Promise(resolve => {
setTimeout(() => {
resolve('/upload.do');
}, 2000);
Expand All @@ -31,10 +30,12 @@ const Test = () => {
}}
>
<div>
<Upload {...props}><a>开始上传</a></Upload>
<Upload {...props}>
<a>开始上传</a>
</Upload>
</div>
</div>
);
};

ReactDOM.render(<Test/>, document.getElementById('__react-content'));
export default Test;
1 change: 0 additions & 1 deletion examples/beforeUpload.html

This file was deleted.

11 changes: 6 additions & 5 deletions examples/beforeUpload.js → examples/beforeUpload.tsx
@@ -1,8 +1,7 @@
/* eslint no-console:0 */

import React from 'react';
import ReactDOM from 'react-dom';
import Upload from 'rc-upload';
import Upload from '..';

const props = {
action: '/upload.do',
Expand All @@ -18,7 +17,7 @@ const props = {
},
beforeUpload(file, fileList) {
console.log(file, fileList);
return new Promise((resolve) => {
return new Promise(resolve => {
console.log('start check');
setTimeout(() => {
console.log('check finshed');
Expand All @@ -36,10 +35,12 @@ const Test = () => {
}}
>
<div>
<Upload {...props}><a>开始上传</a></Upload>
<Upload {...props}>
<a>开始上传</a>
</Upload>
</div>
</div>
);
};

ReactDOM.render(<Test/>, document.getElementById('__react-content'));
export default Test;
1 change: 0 additions & 1 deletion examples/customRequest.html

This file was deleted.

9 changes: 4 additions & 5 deletions examples/customRequest.js → examples/customRequest.tsx
@@ -1,8 +1,7 @@
/* eslint no-console:0 */
import React from 'react';
import ReactDOM from 'react-dom';
import Upload from 'rc-upload';
import axios from 'axios';
import Upload from '..';

const uploadProps = {
action: '/upload.do',
Expand Down Expand Up @@ -49,7 +48,7 @@ const uploadProps = {
withCredentials,
headers,
onUploadProgress: ({ total, loaded }) => {
onProgress({ percent: Math.round(loaded / total * 100).toFixed(2) }, file);
onProgress({ percent: Math.round((loaded / total) * 100).toFixed(2) }, file);
},
})
.then(({ data: response }) => {
Expand All @@ -74,11 +73,11 @@ const Test = () => {
>
<div>
<Upload {...uploadProps}>
<button>开始上传</button>
<button type="button">开始上传</button>
</Upload>
</div>
</div>
);
};

ReactDOM.render(<Test />, document.getElementById('__react-content'));
export default Test;
1 change: 0 additions & 1 deletion examples/directoryUpload.html

This file was deleted.

49 changes: 0 additions & 49 deletions examples/directoryUpload.js

This file was deleted.

43 changes: 43 additions & 0 deletions examples/directoryUpload.tsx
@@ -0,0 +1,43 @@
/* eslint no-console:0 */

import React from 'react';
import Upload from '..';

const Test = () => {
const uploaderProps = {
action: '/upload.do',
data: { a: 1, b: 2 },
directory: true,
beforeUpload(file) {
console.log('beforeUpload', file.name);
},
onStart: file => {
console.log('onStart', file.name);
},
onSuccess(file) {
console.log('onSuccess', file);
},
onProgress(step, file) {
console.log('onProgress', Math.round(step.percent), file.name);
},
onError(err) {
console.log('onError', err);
},
};

return (
<div
style={{
margin: 100,
}}
>
<div>
<Upload {...uploaderProps}>
<a>开始上传</a>
</Upload>
</div>
</div>
);
};

export default Test;
1 change: 0 additions & 1 deletion examples/drag.html

This file was deleted.

24 changes: 19 additions & 5 deletions examples/drag.js → examples/drag.tsx
@@ -1,8 +1,6 @@
/* eslint no-console:0 */

import React from 'react';
import ReactDOM from 'react-dom';
import Upload from 'rc-upload';
import Upload from '..';

const props = {
action: '/upload.do',
Expand All @@ -11,7 +9,7 @@ const props = {
beforeUpload(file) {
console.log('beforeUpload', file.name);
},
onStart: (file) => {
onStart: file => {
console.log('onStart', file.name);
},
onSuccess(file) {
Expand All @@ -27,4 +25,20 @@ const props = {
// openFileDialogOnClick: false
};

ReactDOM.render(<Upload {...props} />, document.getElementById('__react-content'));
const Test = () => {
return (
<div
style={{
margin: 100,
}}
>
<div>
<Upload {...props}>
<a>开始上传</a>
</Upload>
</div>
</div>
);
};

export default Test;
1 change: 0 additions & 1 deletion examples/simple.html

This file was deleted.