diff --git a/.eslintrc b/.eslintrc index ebb56cb71..fbc3d1c14 100644 --- a/.eslintrc +++ b/.eslintrc @@ -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", diff --git a/antdv-demo b/antdv-demo index ff17e1b01..b5570372e 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit ff17e1b0157734c1e0367bc92ef3cc75a83e177e +Subproject commit b5570372e19a456a3e4d32c362459da4e555b608 diff --git a/package.json b/package.json index b66a4580f..826f75bad 100644 --- a/package.json +++ b/package.json @@ -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",