fanwh / workai-design-blocks · 提交

提交 3217aa713241e8c0cc2ece850881fe3b2511f4cd

作者 愚道
2 个父辈 db5f1e12 7743200f

Merge branch 'master' of github.com:umijs/umi-materials

内嵌 并排对比
正在显示 32 个修改的文件 包含 35 行增加 和 70 行删除
@@ -20,12 +20,12 @@ module.exports = { @@ -20,12 +20,12 @@ module.exports = {
20 'react/prop-types': 0, 20 'react/prop-types': 0,
21 'react/forbid-prop-types': 0, 21 'react/forbid-prop-types': 0,
22 'react/jsx-one-expression-per-line': 0, 22 'react/jsx-one-expression-per-line': 0,
23 - 'import/no-unresolved': [2, { ignore: ['^@/', '^umi/'] }], 23 + 'import/no-unresolved': 0,
24 'import/no-extraneous-dependencies': [ 24 'import/no-extraneous-dependencies': [
25 2, 25 2,
26 { 26 {
27 optionalDependencies: true, 27 optionalDependencies: true,
28 - devDependencies: ['**/tests/**.js', '/mock/**.js', '**/**.test.js'], 28 + devDependencies: ['**/tests/**.js', '/mock/**.js', '**/**.test.js', '**/_scripts/*.js'],
29 }, 29 },
30 ], 30 ],
31 'jsx-a11y/no-noninteractive-element-interactions': 0, 31 'jsx-a11y/no-noninteractive-element-interactions': 0,
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
6 *----------*****-------------- 6 *----------*****--------------
7 */ 7 */
8 8
9 -const glob = require('glob');  
10 const prettier = require('prettier'); 9 const prettier = require('prettier');
11 const fs = require('fs'); 10 const fs = require('fs');
  11 +
12 const prettierConfigPath = require.resolve('../.prettierrc'); 12 const prettierConfigPath = require.resolve('../.prettierrc');
13 13
14 const files = process.argv.slice(2); 14 const files = process.argv.slice(2);
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 const glob = require('glob'); 9 const glob = require('glob');
10 const prettier = require('prettier'); 10 const prettier = require('prettier');
11 const fs = require('fs'); 11 const fs = require('fs');
  12 +
12 const prettierConfigPath = require.resolve('../.prettierrc'); 13 const prettierConfigPath = require.resolve('../.prettierrc');
13 14
14 let didError = false; 15 let didError = false;
@@ -5,7 +5,7 @@ AccountCenter @@ -5,7 +5,7 @@ AccountCenter
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/AccountCenter 8 +umi block add ant-design-pro/AccountCenter
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ AccountSettings @@ -5,7 +5,7 @@ AccountSettings
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/AccountSettings 8 +umi block add ant-design-pro/AccountSettings
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ AdvancedForm @@ -5,7 +5,7 @@ AdvancedForm
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/advancedform 8 +umi block add ant-design-pro/advancedform
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ AdvancedProfile @@ -5,7 +5,7 @@ AdvancedProfile
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/advancedprofile 8 +umi block add ant-design-pro/advancedprofile
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Analysis @@ -5,7 +5,7 @@ Analysis
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/analysis 8 +umi block add ant-design-pro/analysis
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ BasicForm @@ -5,7 +5,7 @@ BasicForm
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/basicform 8 +umi block add ant-design-pro/basicform
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ BasicList @@ -5,7 +5,7 @@ BasicList
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/basiclist 8 +umi block add ant-design-pro/basiclist
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
1 -  
2 import request from 'umi-request'; 1 import request from 'umi-request';
3 2
4 export async function queryFakeList(params) { 3 export async function queryFakeList(params) {
@@ -5,7 +5,7 @@ BasicProfile @@ -5,7 +5,7 @@ BasicProfile
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/basicprofile 8 +umi block add ant-design-pro/basicprofile
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ CardList @@ -5,7 +5,7 @@ CardList
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/cardlist 8 +umi block add ant-design-pro/cardlist
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Exception403 @@ -5,7 +5,7 @@ Exception403
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/exception403 8 +umi block add ant-design-pro/exception403
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Exception404 @@ -5,7 +5,7 @@ Exception404
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/exception404 8 +umi block add ant-design-pro/exception404
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Exception500 @@ -5,7 +5,7 @@ Exception500
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/exception500 8 +umi block add ant-design-pro/exception500
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Monitor @@ -5,7 +5,7 @@ Monitor
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/monitor 8 +umi block add ant-design-pro/monitor
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ ResultError @@ -5,7 +5,7 @@ ResultError
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/resulterror 8 +umi block add ant-design-pro/resulterror
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ ResultSuccess @@ -5,7 +5,7 @@ ResultSuccess
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/resultsuccess 8 +umi block add ant-design-pro/resultsuccess
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ SearchList @@ -5,7 +5,7 @@ SearchList
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/searchlist 8 +umi block add ant-design-pro/searchlist
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ SearchListApplications @@ -5,7 +5,7 @@ SearchListApplications
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/searchlistapplications 8 +umi block add ant-design-pro/searchlistapplications
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ SearchListArticles @@ -5,7 +5,7 @@ SearchListArticles
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/searchlistarticles 8 +umi block add ant-design-pro/searchlistarticles
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ SearchListProjects @@ -5,7 +5,7 @@ SearchListProjects
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/searchlistprojects 8 +umi block add ant-design-pro/searchlistprojects
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ StepForm @@ -5,7 +5,7 @@ StepForm
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/stepform 8 +umi block add ant-design-pro/stepform
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
1 -  
2 import nzh from 'nzh/cn'; 1 import nzh from 'nzh/cn';
3 2
4 export function digitUppercase(n) { 3 export function digitUppercase(n) {
@@ -5,7 +5,7 @@ TableList @@ -5,7 +5,7 @@ TableList
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/TableList 8 +umi block add ant-design-pro/TableList
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ UserLogin @@ -5,7 +5,7 @@ UserLogin
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/UserLogin 8 +umi block add ant-design-pro/UserLogin
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ UserRegister @@ -5,7 +5,7 @@ UserRegister
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/UserRegister 8 +umi block add ant-design-pro/UserRegister
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ UserRegisterResult @@ -5,7 +5,7 @@ UserRegisterResult
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/UserRegisterResult 8 +umi block add ant-design-pro/UserRegisterResult
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ Workplace @@ -5,7 +5,7 @@ Workplace
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block ant-design-pro/Workplace 8 +umi block add ant-design-pro/Workplace
9 ``` 9 ```
10 10
11 ## SNAPSHOT 11 ## SNAPSHOT
@@ -5,7 +5,7 @@ A blank block for quick start a umi page develop. @@ -5,7 +5,7 @@ A blank block for quick start a umi page develop.
5 ## Usage 5 ## Usage
6 6
7 ```sh 7 ```sh
8 -umi block https://github.com/umijs/umi-blocks/tree/master/blank 8 +umi block add https://github.com/umijs/umi-blocks/tree/master/blank
9 ``` 9 ```
10 10
11 ## LICENSE 11 ## LICENSE
1 { 1 {
2 - "name": "ant-design-pro",  
3 - "version": "2.1.1",  
4 - "description": "An out-of-box UI solution for enterprise applications",  
5 "private": true, 2 "private": true,
6 "scripts": { 3 "scripts": {
7 "lint:style": "stylelint \"src/**/*.less\" --syntax less", 4 "lint:style": "stylelint \"src/**/*.less\" --syntax less",
@@ -9,23 +6,10 @@ @@ -9,23 +6,10 @@
9 "lint:fix": "eslint --fix --ext .js src mock tests && npm run lint:style", 6 "lint:fix": "eslint --fix --ext .js src mock tests && npm run lint:style",
10 "lint-staged": "lint-staged", 7 "lint-staged": "lint-staged",
11 "lint-staged:js": "eslint --ext .js", 8 "lint-staged:js": "eslint --ext .js",
12 - "tslint": "npm run tslint:fix",  
13 - "tslint:fix": "tslint --fix 'src/**/*.ts*'",  
14 - "test": "umi test",  
15 - "test:component": "umi test ./src/components",  
16 - "test:all": "node ./tests/run-tests.js",  
17 - "prettier": "node ./scripts/prettier.js"  
18 - },  
19 - "dependencies": {  
20 - 9 + "prettier": "node ./_scripts/prettier.js"
21 }, 10 },
22 "devDependencies": { 11 "devDependencies": {
23 - "@types/react": "^16.7.7",  
24 - "@types/react-dom": "^16.0.10",  
25 "babel-eslint": "^10.0.1", 12 "babel-eslint": "^10.0.1",
26 - "cross-env": "^5.1.1",  
27 - "cross-port-killer": "^1.0.1",  
28 - "enzyme": "^3.7.0",  
29 "eslint": "^5.4.0", 13 "eslint": "^5.4.0",
30 "eslint-config-airbnb": "^17.0.0", 14 "eslint-config-airbnb": "^17.0.0",
31 "eslint-config-prettier": "^3.0.1", 15 "eslint-config-prettier": "^3.0.1",
@@ -35,40 +19,22 @@ @@ -35,40 +19,22 @@
35 "eslint-plugin-jsx-a11y": "^6.1.2", 19 "eslint-plugin-jsx-a11y": "^6.1.2",
36 "eslint-plugin-markdown": "^1.0.0-beta.6", 20 "eslint-plugin-markdown": "^1.0.0-beta.6",
37 "eslint-plugin-react": "^7.11.1", 21 "eslint-plugin-react": "^7.11.1",
38 - "gh-pages": "^2.0.1", 22 + "glob": "^7.1.3",
39 "husky": "^1.2.0", 23 "husky": "^1.2.0",
40 - "jest-puppeteer": "^3.5.1",  
41 "lint-staged": "^8.1.0", 24 "lint-staged": "^8.1.0",
42 - "merge-umi-mock-data": "^0.0.3",  
43 - "mockjs": "^1.0.1-beta3",  
44 "prettier": "1.15.2", 25 "prettier": "1.15.2",
45 - "pro-download": "^1.0.1",  
46 "stylelint": "^9.8.0", 26 "stylelint": "^9.8.0",
47 "stylelint-config-prettier": "^4.0.0", 27 "stylelint-config-prettier": "^4.0.0",
48 - "stylelint-config-standard": "^18.0.0",  
49 - "tslint": "^5.10.0",  
50 - "tslint-config-prettier": "^1.10.0",  
51 - "tslint-react": "^3.6.0"  
52 - },  
53 - "optionalDependencies": {  
54 - "puppeteer": "^1.10.0" 28 + "stylelint-config-standard": "^18.0.0"
55 }, 29 },
56 "lint-staged": { 30 "lint-staged": {
57 - "**/*.{js,ts,tsx,json,jsx,less}": [  
58 - "node ./scripts/lint-prettier.js", 31 + "x/**/*.{js,ts,tsx,json,jsx,less}": [
  32 + "node ./_scripts/lint-prettier.js",
59 "git add" 33 "git add"
60 ], 34 ],
61 "**/*.{js,jsx}": "npm run lint-staged:js", 35 "**/*.{js,jsx}": "npm run lint-staged:js",
62 "**/*.less": "stylelint --syntax less" 36 "**/*.less": "stylelint --syntax less"
63 }, 37 },
64 - "engines": {  
65 - "node": ">=8.0.0"  
66 - },  
67 - "browserslist": [  
68 - "> 1%",  
69 - "last 2 versions",  
70 - "not ie <= 10"  
71 - ],  
72 "husky": { 38 "husky": {
73 "hooks": { 39 "hooks": {
74 "pre-commit": "npm run lint-staged" 40 "pre-commit": "npm run lint-staged"
请 注册 或 登录 后发表评论