Merge branch 'master' into 2.0

This commit is contained in:
tangjinzhou 2020-04-05 21:42:06 +08:00
commit 721ae4a547
2 changed files with 14 additions and 4 deletions

View File

@ -12,6 +12,14 @@
},
"extends": ["plugin:vue/recommended", "prettier"],
"plugins": ["markdown"],
"overrides": [
{
"files": ["**/demo/**"],
"rules": {
"no-console": "off"
}
}
],
"rules": {
"comma-dangle": [2, "always-multiline"],
"no-var": "error",

View File

@ -38,6 +38,8 @@
"pretty-quick": "pretty-quick",
"dist": "node antd-tools/cli/run.js dist",
"lint": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./components",
"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",
"codecov": "codecov",
"postinstall": "node scripts/postinstall || echo \"ignore\""
@ -98,11 +100,11 @@
"css-loader": "^3.0.0",
"deep-assign": "^2.0.0",
"enquire-js": "^0.2.1",
"eslint": "^6.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-html": "^6.0.0",
"eslint-plugin-markdown": "^1.0.0",
"eslint-plugin-vue": "^6.0.0",
"eslint-plugin-markdown": "^1.0.2",
"eslint-plugin-vue": "^6.2.2",
"fetch-jsonp": "^1.1.3",
"fs-extra": "^8.0.0",
"glob": "^7.1.2",