Skip to content

Commit d84df9a

Browse files
committed
feat: support Prettier eslint config (pending)
waiting on prettier/eslint-plugin-prettier#78
1 parent a4fbee1 commit d84df9a

File tree

4 files changed

+46
-5
lines changed

4 files changed

+46
-5
lines changed

packages/@vue/cli-plugin-eslint/generator.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ module.exports = (api, { config, lintOn = [] }) => {
2626
'@vue/eslint-config-standard': '^3.0.0-alpha.1'
2727
})
2828
} else if (config === 'prettier') {
29-
// TODO
29+
pkg.eslintConfig.extends.push('@vue/prettier')
30+
Object.assign(pkg.devDependencies, {
31+
'@vue/eslint-config-prettier': '^3.0.0-alpha.1'
32+
})
3033
} else {
3134
// default
3235
pkg.eslintConfig.extends.push('eslint:recommended')
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
plugins: ['prettier'],
3+
extends: [
4+
require.resolve('eslint-config-prettier')
5+
],
6+
rules: {
7+
'prettier/prettier': 'error'
8+
}
9+
}

packages/@vue/eslint-config-prettier/package.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,10 @@
1919
"bugs": {
2020
"url": "https://github.com/vuejs/vue-cli/issues"
2121
},
22-
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/eslint-config-prettier#readme"
22+
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/eslint-config-prettier#readme",
23+
"dependencies": {
24+
"eslint-config-prettier": "^2.9.0",
25+
"eslint-plugin-prettier": "^2.4.0",
26+
"prettier": "^1.10.2"
27+
}
2328
}

yarn.lock

+27-3
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ babel-plugin-syntax-object-rest-spread@^6.13.0:
11531153
version "6.13.0"
11541154
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
11551155

1156-
babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
1156+
babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
11571157
version "6.26.0"
11581158
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
11591159
dependencies:
@@ -3141,6 +3141,12 @@ eslint-config-airbnb-base@^12.1.0:
31413141
dependencies:
31423142
eslint-restricted-globals "^0.1.1"
31433143

3144+
eslint-config-prettier@^2.9.0:
3145+
version "2.9.0"
3146+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
3147+
dependencies:
3148+
get-stdin "^5.0.1"
3149+
31443150
eslint-config-standard@^11.0.0-beta.0:
31453151
version "11.0.0-beta.0"
31463152
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0-beta.0.tgz#f8afe69803d95c685a4b8392b8793188eb03cbb3"
@@ -3215,6 +3221,13 @@ eslint-plugin-node@^5.2.1:
32153221
resolve "^1.3.3"
32163222
semver "5.3.0"
32173223

3224+
eslint-plugin-prettier@^2.4.0:
3225+
version "2.4.0"
3226+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz#85cab0775c6d5e3344ef01e78d960f166fb93aae"
3227+
dependencies:
3228+
fast-diff "^1.1.1"
3229+
jest-docblock "^21.0.0"
3230+
32183231
eslint-plugin-promise@^3.6.0:
32193232
version "3.6.0"
32203233
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz#54b7658c8f454813dc2a870aff8152ec4969ba75"
@@ -3558,6 +3571,10 @@ fast-deep-equal@^1.0.0:
35583571
version "1.0.0"
35593572
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
35603573

3574+
fast-diff@^1.1.1:
3575+
version "1.1.2"
3576+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
3577+
35613578
35623579
version "0.0.2"
35633580
resolved "https://registry.yarnpkg.com/fast-extend/-/fast-extend-0.0.2.tgz#f5ec42cf40b9460f521a6387dfb52deeed671dbd"
@@ -3963,6 +3980,10 @@ get-stdin@^4.0.1:
39633980
version "4.0.1"
39643981
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
39653982

3983+
get-stdin@^5.0.1:
3984+
version "5.0.1"
3985+
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
3986+
39663987
get-stream@^2.2.0:
39673988
version "2.3.1"
39683989
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
@@ -5125,6 +5146,10 @@ jest-diff@^22.1.0:
51255146
jest-get-type "^22.1.0"
51265147
pretty-format "^22.1.0"
51275148

5149+
jest-docblock@^21.0.0:
5150+
version "21.2.0"
5151+
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
5152+
51285153
jest-docblock@^22.1.0:
51295154
version "22.1.0"
51305155
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.1.0.tgz#3fe5986d5444cbcb149746eb4b07c57c5a464dfd"
@@ -7182,7 +7207,7 @@ preserve@^0.2.0:
71827207
version "0.2.0"
71837208
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
71847209

7185-
prettier@^1.7.0:
7210+
prettier@^1.10.2, prettier@^1.7.0:
71867211
version "1.10.2"
71877212
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
71887213

@@ -9223,7 +9248,6 @@ vue-jest@yyx990803/vue-jest:
92239248
version "1.4.0"
92249249
resolved "https://codeload.github.com/yyx990803/vue-jest/tar.gz/2ce12141b70161893982325ea72f1f2dcfdc6f04"
92259250
dependencies:
9226-
babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
92279251
chalk "^2.1.0"
92289252
find-babel-config "^1.1.0"
92299253
js-beautify "^1.6.14"

0 commit comments

Comments
 (0)