Skip to content

Commit

Permalink
Merge pull request #2117 from yoyo930021/downgrade-prettier-eslint
Browse files Browse the repository at this point in the history
Fix prettier-eslint error when formatting in v0.26.0
  • Loading branch information
octref authored Aug 6, 2020
2 parents 7a513c4 + b55c522 commit a55decd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

### 0.26.1
- 🙌 Fix prettier-eslint error when formatting. Thanks to contribution from [@yoyo930021](https://github.com/yoyo930021). #2117.

### 0.26.0 | 2020-08-04 | [VSIX](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/octref/vsextensions/vetur/0.26.0/vspackage)

- Load different `eslint-plugin-vue` rulesets depending on workspace vue version. #2015.
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"nuxt-helper-json": "^1.0.0",
"parse-gitignore": "^1.0.1",
"prettier": "^2.0.5",
"prettier-eslint": "^11.0.0",
"prettier-eslint": "10",
"prettier-tslint": "^0.4.2",
"read-pkg-up": "^7.0.1",
"resolve": "^1.8.1",
Expand Down
14 changes: 8 additions & 6 deletions server/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@
"@typescript-eslint/types" "3.7.1"
"@typescript-eslint/visitor-keys" "3.7.1"
debug "^4.1.1"
glob "^7.1.6"
is-glob "^4.0.1"
lodash "^4.17.15"
semver "^7.3.2"
Expand Down Expand Up @@ -3378,9 +3379,10 @@ prepend-http@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"

prettier-eslint@^11.0.0:
version "11.0.0"
resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-11.0.0.tgz#b19b97c8a1fc4c898b7d1a54b948ef957ceb101d"
prettier-eslint@10:
version "10.1.1"
resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-10.1.1.tgz#52e203d367e158038174444edf85519c4175ac1d"
integrity sha512-TtYxuFUMVxudJTSnPScaBqHZm/48ndvX3KLFzhejJYbRzRybmM9RdBfn9YzgN0itfPrYxCesIZGJqyXXZJOR2w==
dependencies:
"@typescript-eslint/parser" "^3.0.0"
common-tags "^1.4.0"
Expand All @@ -3389,7 +3391,7 @@ prettier-eslint@^11.0.0:
indent-string "^4.0.0"
lodash.merge "^4.6.0"
loglevel-colored-level-prefix "^1.0.0"
prettier "^2.0.0"
prettier "^1.7.0"
pretty-format "^23.0.1"
require-relative "^0.8.7"
typescript "^3.9.3"
Expand All @@ -3406,11 +3408,11 @@ prettier-tslint@^0.4.2:
tslint "^5.9.1"
yargs "^11.0.0"

prettier@^1.18.2:
prettier@^1.18.2, prettier@^1.7.0:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"

prettier@^2.0.0, prettier@^2.0.5:
prettier@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"

Expand Down

0 comments on commit a55decd

Please sign in to comment.