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

@@ -20,12 +20,12 @@ module.exports = {
     'react/prop-types': 0,
     'react/forbid-prop-types': 0,
     'react/jsx-one-expression-per-line': 0,
-    'import/no-unresolved': [2, { ignore: ['^@/', '^umi/'] }],
+    'import/no-unresolved': 0,
     'import/no-extraneous-dependencies': [
       2,
       {
         optionalDependencies: true,
-        devDependencies: ['**/tests/**.js', '/mock/**.js', '**/**.test.js'],
+        devDependencies: ['**/tests/**.js', '/mock/**.js', '**/**.test.js', '**/_scripts/*.js'],
       },
     ],
     'jsx-a11y/no-noninteractive-element-interactions': 0,

@@ -6,9 +6,9 @@
  *----------*****--------------
  */
 
-const glob = require('glob');
 const prettier = require('prettier');
 const fs = require('fs');
+
 const prettierConfigPath = require.resolve('../.prettierrc');
 
 const files = process.argv.slice(2);

@@ -9,6 +9,7 @@
 const glob = require('glob');
 const prettier = require('prettier');
 const fs = require('fs');
+
 const prettierConfigPath = require.resolve('../.prettierrc');
 
 let didError = false;

@@ -5,7 +5,7 @@ AccountCenter
 ## Usage
 
 ```sh
-umi block ant-design-pro/AccountCenter
+umi block add ant-design-pro/AccountCenter
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ AccountSettings
 ## Usage
 
 ```sh
-umi block ant-design-pro/AccountSettings
+umi block add ant-design-pro/AccountSettings
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ AdvancedForm
 ## Usage
 
 ```sh
-umi block ant-design-pro/advancedform
+umi block add ant-design-pro/advancedform
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ AdvancedProfile
 ## Usage
 
 ```sh
-umi block ant-design-pro/advancedprofile
+umi block add ant-design-pro/advancedprofile
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Analysis
 ## Usage
 
 ```sh
-umi block ant-design-pro/analysis
+umi block add ant-design-pro/analysis
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ BasicForm
 ## Usage
 
 ```sh
-umi block ant-design-pro/basicform
+umi block add ant-design-pro/basicform
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ BasicList
 ## Usage
 
 ```sh
-umi block ant-design-pro/basiclist
+umi block add ant-design-pro/basiclist
 ```
 
 ## SNAPSHOT

-
 import request from 'umi-request';
 
 export async function queryFakeList(params) {

@@ -5,7 +5,7 @@ BasicProfile
 ## Usage
 
 ```sh
-umi block ant-design-pro/basicprofile
+umi block add ant-design-pro/basicprofile
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ CardList
 ## Usage
 
 ```sh
-umi block ant-design-pro/cardlist
+umi block add ant-design-pro/cardlist
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Exception403
 ## Usage
 
 ```sh
-umi block ant-design-pro/exception403
+umi block add ant-design-pro/exception403
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Exception404
 ## Usage
 
 ```sh
-umi block ant-design-pro/exception404
+umi block add ant-design-pro/exception404
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Exception500
 ## Usage
 
 ```sh
-umi block ant-design-pro/exception500
+umi block add ant-design-pro/exception500
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Monitor
 ## Usage
 
 ```sh
-umi block ant-design-pro/monitor
+umi block add ant-design-pro/monitor
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ ResultError
 ## Usage
 
 ```sh
-umi block ant-design-pro/resulterror
+umi block add ant-design-pro/resulterror
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ ResultSuccess
 ## Usage
 
 ```sh
-umi block ant-design-pro/resultsuccess
+umi block add ant-design-pro/resultsuccess
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ SearchList
 ## Usage
 
 ```sh
-umi block ant-design-pro/searchlist
+umi block add ant-design-pro/searchlist
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ SearchListApplications
 ## Usage
 
 ```sh
-umi block ant-design-pro/searchlistapplications
+umi block add ant-design-pro/searchlistapplications
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ SearchListArticles
 ## Usage
 
 ```sh
-umi block ant-design-pro/searchlistarticles
+umi block add ant-design-pro/searchlistarticles
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ SearchListProjects
 ## Usage
 
 ```sh
-umi block ant-design-pro/searchlistprojects
+umi block add ant-design-pro/searchlistprojects
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ StepForm
 ## Usage
 
 ```sh
-umi block ant-design-pro/stepform
+umi block add ant-design-pro/stepform
 ```
 
 ## SNAPSHOT

-
 import nzh from 'nzh/cn';
 
 export function digitUppercase(n) {

@@ -5,7 +5,7 @@ TableList
 ## Usage
 
 ```sh
-umi block ant-design-pro/TableList
+umi block add ant-design-pro/TableList
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ UserLogin
 ## Usage
 
 ```sh
-umi block ant-design-pro/UserLogin
+umi block add ant-design-pro/UserLogin
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ UserRegister
 ## Usage
 
 ```sh
-umi block ant-design-pro/UserRegister
+umi block add ant-design-pro/UserRegister
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ UserRegisterResult
 ## Usage
 
 ```sh
-umi block ant-design-pro/UserRegisterResult
+umi block add ant-design-pro/UserRegisterResult
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ Workplace
 ## Usage
 
 ```sh
-umi block ant-design-pro/Workplace
+umi block add ant-design-pro/Workplace
 ```
 
 ## SNAPSHOT

@@ -5,7 +5,7 @@ A blank block for quick start a umi page develop.
 ## Usage
 
 ```sh
-umi block https://github.com/umijs/umi-blocks/tree/master/blank
+umi block add https://github.com/umijs/umi-blocks/tree/master/blank
 ```
 
 ## LICENSE

 {
-  "name": "ant-design-pro",
-  "version": "2.1.1",
-  "description": "An out-of-box UI solution for enterprise applications",
   "private": true,
   "scripts": {
     "lint:style": "stylelint \"src/**/*.less\" --syntax less",
@@ -9,23 +6,10 @@
     "lint:fix": "eslint --fix --ext .js src mock tests && npm run lint:style",
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js",
-    "tslint": "npm run tslint:fix",
-    "tslint:fix": "tslint --fix 'src/**/*.ts*'",
-    "test": "umi test",
-    "test:component": "umi test ./src/components",
-    "test:all": "node ./tests/run-tests.js",
-    "prettier": "node ./scripts/prettier.js"
-  },
-  "dependencies": {
-   
+    "prettier": "node ./_scripts/prettier.js"
   },
   "devDependencies": {
-    "@types/react": "^16.7.7",
-    "@types/react-dom": "^16.0.10",
     "babel-eslint": "^10.0.1",
-    "cross-env": "^5.1.1",
-    "cross-port-killer": "^1.0.1",
-    "enzyme": "^3.7.0",
     "eslint": "^5.4.0",
     "eslint-config-airbnb": "^17.0.0",
     "eslint-config-prettier": "^3.0.1",
@@ -35,40 +19,22 @@
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-markdown": "^1.0.0-beta.6",
     "eslint-plugin-react": "^7.11.1",
-    "gh-pages": "^2.0.1",
+    "glob": "^7.1.3",
     "husky": "^1.2.0",
-    "jest-puppeteer": "^3.5.1",
     "lint-staged": "^8.1.0",
-    "merge-umi-mock-data": "^0.0.3",
-    "mockjs": "^1.0.1-beta3",
     "prettier": "1.15.2",
-    "pro-download": "^1.0.1",
     "stylelint": "^9.8.0",
     "stylelint-config-prettier": "^4.0.0",
-    "stylelint-config-standard": "^18.0.0",
-    "tslint": "^5.10.0",
-    "tslint-config-prettier": "^1.10.0",
-    "tslint-react": "^3.6.0"
-  },
-  "optionalDependencies": {
-    "puppeteer": "^1.10.0"
+    "stylelint-config-standard": "^18.0.0"
   },
   "lint-staged": {
-    "**/*.{js,ts,tsx,json,jsx,less}": [
-      "node ./scripts/lint-prettier.js",
+    "x/**/*.{js,ts,tsx,json,jsx,less}": [
+      "node ./_scripts/lint-prettier.js",
       "git add"
     ],
     "**/*.{js,jsx}": "npm run lint-staged:js",
     "**/*.less": "stylelint --syntax less"
   },
-  "engines": {
-    "node": ">=8.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ],
   "husky": {
     "hooks": {
       "pre-commit": "npm run lint-staged"