Skip to content

Commit 2a7fa6a

Browse files
committed
Use proseWrap: never for better git diffs
1 parent b76e316 commit 2a7fa6a

File tree

4 files changed

+115
-287
lines changed

4 files changed

+115
-287
lines changed

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/test-config/

.prettierrc.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
{}
1+
{
2+
"proseWrap": "never"
3+
}

CHANGELOG.md

+46-119
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
### Version 6.10.0 (2020-01-28)
22

3-
- Added: [@typescript-eslint/comma-spacing]. Thanks to Thanks to Masafumi
4-
Koba (@ybiquitous)!!
3+
- Added: [@typescript-eslint/comma-spacing]. Thanks to Thanks to Masafumi Koba (@ybiquitous)!!
54

65
### Version 6.9.0 (2019-12-27)
76

@@ -13,48 +12,37 @@
1312

1413
### Version 6.7.0 (2019-11-19)
1514

16-
- Added: [@typescript-eslint/space-before-function-paren]. Thanks to Masafumi
17-
Koba (@ybiquitous)!
15+
- Added: [@typescript-eslint/space-before-function-paren]. Thanks to Masafumi Koba (@ybiquitous)!
1816

1917
### Version 6.6.0 (2019-11-17)
2018

21-
- Added: New [eslint-plugin-vue] rules: [vue/dot-location] and
22-
[vue/keyword-spacing]. Thanks to @xcatliu!
19+
- Added: New [eslint-plugin-vue] rules: [vue/dot-location] and [vue/keyword-spacing]. Thanks to @xcatliu!
2320

2421
### Version 6.5.0 (2019-10-26)
2522

26-
- Added: Support for [excluding deprecated rules]. Thanks to Alex Ilyaev
27-
(@alexilyaev)!
23+
- Added: Support for [excluding deprecated rules]. Thanks to Alex Ilyaev (@alexilyaev)!
2824

2925
### Version 6.4.0 (2019-10-05)
3026

31-
- Added: [unicorn/no-nested-ternary]. Thanks to Yang Mingshan
32-
(@yangmingshan)!
27+
- Added: [unicorn/no-nested-ternary]. Thanks to Yang Mingshan (@yangmingshan)!
3328

3429
### Version 6.3.0 (2019-09-10)
3530

36-
- Added: [@typescript-eslint/brace-style]. Thanks to Masafumi Koba
37-
(@ybiquitous)!
31+
- Added: [@typescript-eslint/brace-style]. Thanks to Masafumi Koba (@ybiquitous)!
3832

3933
### Version 6.2.0 (2019-09-03)
4034

41-
- Added: [@typescript-eslint/quotes] (as a [special
42-
rule][@typescript-eslint/quotes-special]). Thanks to Masafumi Koba
43-
(@ybiquitous)!
35+
- Added: [@typescript-eslint/quotes] (as a [special rule][@typescript-eslint/quotes-special]). Thanks to Masafumi Koba (@ybiquitous)!
4436

4537
### Version 6.1.0 (2019-08-19)
4638

47-
- Added: [function-call-argument-newline] \(new in ESLint 6.2.0). Thanks to
48-
Masafumi Koba (@ybiquitous)!
39+
- Added: [function-call-argument-newline] \(new in ESLint 6.2.0). Thanks to Masafumi Koba (@ybiquitous)!
4940

5041
### Version 6.0.0 (2019-06-25)
5142

52-
- Changed: The CLI helper tool now considers [no-confusing-arrow] to conflict
53-
if you use the default value of its `allowParens` option. The default was
54-
changed to `true` in ESLint 6, which conflicts with Prettier.
43+
- Changed: The CLI helper tool now considers [no-confusing-arrow] to conflict if you use the default value of its `allowParens` option. The default was changed to `true` in ESLint 6, which conflicts with Prettier.
5544

56-
If the CLI helper tool gives you errors about this after upgrading, the
57-
solution is to change this:
45+
If the CLI helper tool gives you errors about this after upgrading, the solution is to change this:
5846

5947
```json
6048
{
@@ -76,48 +64,33 @@
7664

7765
The latter works in both ESLint 6 as well as in ESLint 5 and older.
7866

79-
- Improved: `eslint --print-config` usage instructions. The CLI tool help
80-
text as well as the documentation has been updated to suggest commands that
81-
work in ESLint 6.0 as well as in ESLint 5 and older. (Instead of `eslint --print-config .`, use `eslint --print-config path/to/main.js`.)
67+
- Improved: `eslint --print-config` usage instructions. The CLI tool help text as well as the documentation has been updated to suggest commands that work in ESLint 6.0 as well as in ESLint 5 and older. (Instead of `eslint --print-config .`, use `eslint --print-config path/to/main.js`.)
8268

8369
### Version 5.1.0 (2019-06-25)
8470

8571
- Added: [react/jsx-curly-newline]. Thanks to Masafumi Koba (@ybiquitous)!
8672

8773
### Version 5.0.0 (2019-06-15)
8874

89-
- Removed: [react/self-closing-comp]. This rule was added in v4.1.0 not
90-
because it _conflicted_ with Prettier but because it was _unnecessary_ when
91-
using Prettier. However, in v1.18.0 [Prettier stopped converting empty
92-
elements to self-closing elements][prettier-self-closing]. So the rule is
93-
not unnecessary anymore.
75+
- Removed: [react/self-closing-comp]. This rule was added in v4.1.0 not because it _conflicted_ with Prettier but because it was _unnecessary_ when using Prettier. However, in v1.18.0 [Prettier stopped converting empty elements to self-closing elements][prettier-self-closing]. So the rule is not unnecessary anymore.
9476

95-
If you use Prettier v1.17.1 or older you should be able to upgrade
96-
eslint-config-prettier to v5.0.0 without having to do anything else.
77+
If you use Prettier v1.17.1 or older you should be able to upgrade eslint-config-prettier to v5.0.0 without having to do anything else.
9778

98-
If you use Prettier v1.18.0 or newer, you might get lint errors about for
99-
example changing `<div></div>` into `<div />`. You have two options:
79+
If you use Prettier v1.18.0 or newer, you might get lint errors about for example changing `<div></div>` into `<div />`. You have two options:
10080

101-
- Run `eslint --fix` if you prefer to enforce self-closing elements where
102-
possible. This should fix all the errors.
103-
- Add `"react/self-closing-comp": "off"` to your ESLint config if you use
104-
autofix from your editor and you face the same [issue as Prettier
105-
did][prettier-self-closing].
81+
- Run `eslint --fix` if you prefer to enforce self-closing elements where possible. This should fix all the errors.
82+
- Add `"react/self-closing-comp": "off"` to your ESLint config if you use autofix from your editor and you face the same [issue as Prettier did][prettier-self-closing].
10683

107-
- Changed: Node.js 6 is no longer officially supported, but v5.0.0 should
108-
still work with it.
84+
- Changed: Node.js 6 is no longer officially supported, but v5.0.0 should still work with it.
10985

11086
### Version 4.3.0 (2019-05-16)
11187

112-
- Added: New [eslint-plugin-vue] rules: [vue/arrow-spacing],
113-
[vue/block-spacing], [vue/brace-style] and [vue/comma-dangle].
114-
- Added: New [@typescript-eslint/eslint-plugin] rules:
115-
[@typescript-eslint/func-call-spacing] and [@typescript-eslint/semi].
88+
- Added: New [eslint-plugin-vue] rules: [vue/arrow-spacing], [vue/block-spacing], [vue/brace-style] and [vue/comma-dangle].
89+
- Added: New [@typescript-eslint/eslint-plugin] rules: [@typescript-eslint/func-call-spacing] and [@typescript-eslint/semi].
11690

11791
### Version 4.2.0 (2019-04-25)
11892

119-
- Added: [@typescript-eslint/no-extra-parens]. Thanks to Keiichiro Amemiya
120-
(@Hoishin) and Jen Gorfine (@jgorfine)!
93+
- Added: [@typescript-eslint/no-extra-parens]. Thanks to Keiichiro Amemiya (@Hoishin) and Jen Gorfine (@jgorfine)!
12194

12295
### Version 4.1.0 (2019-02-26)
12396

@@ -126,59 +99,37 @@
12699

127100
### Version 4.0.0 (2019-01-26)
128101

129-
- Breaking change: Support for [eslint-plugin-typescript] has been removed and
130-
replaced with support for its successor [@typescript-eslint/eslint-plugin].
131-
Thanks to TANIGUCHI Masaya (@ta2gch) and everyone else who helped with this!
132-
- Changed: [arrow-body-style] and [prefer-arrow-callback] are now marked as
133-
[special rules][arrow-special], since they might cause problems if using
134-
[eslint-plugin-prettier] and `--fix`. They are turned off by default, and the
135-
CLI helper tool will _warn_ about them (but not error if you do enable them).
136-
This won’t break your linting checks, but do note that these rules will be
137-
disabled unless you explicitly enable them again, and that you might see new
138-
warnings when running the CLI helper tool.
102+
- Breaking change: Support for [eslint-plugin-typescript] has been removed and replaced with support for its successor [@typescript-eslint/eslint-plugin]. Thanks to TANIGUCHI Masaya (@ta2gch) and everyone else who helped with this!
103+
- Changed: [arrow-body-style] and [prefer-arrow-callback] are now marked as [special rules][arrow-special], since they might cause problems if using [eslint-plugin-prettier] and `--fix`. They are turned off by default, and the CLI helper tool will _warn_ about them (but not error if you do enable them). This won’t break your linting checks, but do note that these rules will be disabled unless you explicitly enable them again, and that you might see new warnings when running the CLI helper tool.
139104

140105
### Version 3.6.0 (2019-01-19)
141106

142-
- Added: Support for [eslint-plugin-babel]. Thanks to Matija Marohnić
143-
(@silvenon)!
107+
- Added: Support for [eslint-plugin-babel]. Thanks to Matija Marohnić (@silvenon)!
144108

145109
### Version 3.5.0 (2019-01-16)
146110

147-
- Fixed: The eslint-plugin-vue change from 3.4.0 has been reverted. That change
148-
requires eslint-plugin-vue@5, while many use eslint-plugin-vue@4. In other
149-
words, it was an accidental breaking change. Also, after thinking about it
150-
some more, it makes sense to have a Prettier-specific list of rules, rather
151-
than using the `vue/no-layout-rules` list, since there can be layout rules
152-
that don’t conflict with but rather complement Prettier.
111+
- Fixed: The eslint-plugin-vue change from 3.4.0 has been reverted. That change requires eslint-plugin-vue@5, while many use eslint-plugin-vue@4. In other words, it was an accidental breaking change. Also, after thinking about it some more, it makes sense to have a Prettier-specific list of rules, rather than using the `vue/no-layout-rules` list, since there can be layout rules that don’t conflict with but rather complement Prettier.
153112
- Added: New eslint-plugin-vue rules coming in the next version after 5.1.0.
154113

155114
### Version 3.4.0 (2019-01-13)
156115

157116
- Added: Support for [eslint-plugin-typescript]. Thanks to Jed Fox (@j-f1)!
158-
- Improved: The eslint-plugin-vue integration is now using the
159-
`vue/no-layout-rules` config behind the scenes, so it should automatically
160-
stay up-to-date when new eslint-plugin-vue versions are released. Thanks to
161-
Michał Sajnóg (@michalsnik)!
117+
- Improved: The eslint-plugin-vue integration is now using the `vue/no-layout-rules` config behind the scenes, so it should automatically stay up-to-date when new eslint-plugin-vue versions are released. Thanks to Michał Sajnóg (@michalsnik)!
162118

163119
### Version 3.3.0 (2018-11-11)
164120

165-
- Added: The [vue/html-self-closing] rule (as a [special
166-
rule][vue/html-self-closing-special]). Thanks to Yamagishi Kazutoshi (@ykzts)!
121+
- Added: The [vue/html-self-closing] rule (as a [special rule][vue/html-self-closing-special]). Thanks to Yamagishi Kazutoshi (@ykzts)!
167122

168123
### Version 3.2.0 (2018-11-10)
169124

170125
- Added: Support for [eslint-plugin-vue].
171-
- Fixed: The CLI helper tool should now work in Node.js 6 with npm 3 again.
172-
Thanks to Grant Snodgrass (@meeber)!
126+
- Fixed: The CLI helper tool should now work in Node.js 6 with npm 3 again. Thanks to Grant Snodgrass (@meeber)!
173127
- Improved: Updated documentation.
174128

175129
### Version 3.1.0 (2018-09-22)
176130

177131
- Added: Support for [eslint-plugin-unicorn]. Thanks to John Mars (@j0hnm4r5)!
178-
- Changed: The [quotes] rule is now allowed to be used to forbid unnecessary
179-
backticks. This means that the CLI helper tool no longer can automatically
180-
validate it, so you’ll need to refer the [quotes special rule
181-
documentation][quotes-special]. Thanks to Nick Petruzzelli (@npetruzzelli)!
132+
- Changed: The [quotes] rule is now allowed to be used to forbid unnecessary backticks. This means that the CLI helper tool no longer can automatically validate it, so you’ll need to refer the [quotes special rule documentation][quotes-special]. Thanks to Nick Petruzzelli (@npetruzzelli)!
182133

183134
### Version 3.0.1 (2018-08-13)
184135

@@ -204,31 +155,24 @@
204155

205156
### Version 2.7.0 (2017-11-01)
206157

207-
- Added: The [lines-around-comment] rule (as a [special
208-
rule][lines-around-comment-special]). Thanks to Maurice de Beijer
209-
(@mauricedb)!
210-
- Added: The [no-unexpected-multiline] rule (as a [special
211-
rule][no-unexpected-multiline-special]). Thanks to Suhas Karanth
212-
(@sudo-suhas)!
158+
- Added: The [lines-around-comment] rule (as a [special rule][lines-around-comment-special]). Thanks to Maurice de Beijer (@mauricedb)!
159+
- Added: The [no-unexpected-multiline] rule (as a [special rule][no-unexpected-multiline-special]). Thanks to Suhas Karanth (@sudo-suhas)!
213160

214161
### Version 2.6.0 (2017-09-23)
215162

216163
- Added: The [no-floating-decimal] rule.
217164

218165
### Version 2.5.0 (2017-09-16)
219166

220-
- Added: Support for [eslint-plugin-standard]. Thanks to Christian Pekeler
221-
(@pekeler)!
167+
- Added: Support for [eslint-plugin-standard]. Thanks to Christian Pekeler (@pekeler)!
222168

223169
### Version 2.4.0 (2017-09-02)
224170

225-
- Added: The [function-paren-newline] rule (new in [ESLint 4.6.0]). Thanks to
226-
Pierre Vanduynslager (@vanduynslagerp)!
171+
- Added: The [function-paren-newline] rule (new in [ESLint 4.6.0]). Thanks to Pierre Vanduynslager (@vanduynslagerp)!
227172

228173
### Version 2.3.0 (2017-06-30)
229174

230-
- Added: The (deprecated) [indent-legacy] rule. Thanks to M. Ian Graham
231-
(@miangraham)!
175+
- Added: The (deprecated) [indent-legacy] rule. Thanks to M. Ian Graham (@miangraham)!
232176

233177
### Version 2.2.0 (2017-06-17)
234178

@@ -245,33 +189,23 @@
245189

246190
### Version 2.1.0 (2017-05-13)
247191

248-
- Added: The [no-tabs] rule (as a [special rule][no-tabs-special]). Thanks to
249-
Alex Meah (@AlexMeah)!
192+
- Added: The [no-tabs] rule (as a [special rule][no-tabs-special]). Thanks to Alex Meah (@AlexMeah)!
250193

251194
### Version 2.0.0 (2017-05-07)
252195

253196
- Changed/Improved: The CLI helper tool is now more helpful.
254197

255-
- The options of special rules are now validated if possible. If a special
256-
rule is enabled with non-conflicting options, the CLI no longer warns about
257-
it.
258-
- If only special rules that cannot be automatically checked are found, the
259-
CLI no longer exists with a non-zero exit code. Instead, it only warns about
260-
the rules.
198+
- The options of special rules are now validated if possible. If a special rule is enabled with non-conflicting options, the CLI no longer warns about it.
199+
- If only special rules that cannot be automatically checked are found, the CLI no longer exists with a non-zero exit code. Instead, it only warns about the rules.
261200

262-
- Changed: The [no-confusing-arrow] is now a special rule again, since it might
263-
conflict with recent Prettier versions.
201+
- Changed: The [no-confusing-arrow] is now a special rule again, since it might conflict with recent Prettier versions.
264202

265-
- Removed: The `react/wrap-multilines` rule (which has been deprecated for a
266-
while), since it was removed in eslint-plugin-react@7.
203+
- Removed: The `react/wrap-multilines` rule (which has been deprecated for a while), since it was removed in eslint-plugin-react@7.
267204

268205
### Version 1.7.0 (2017-04-19)
269206

270-
- Changed: The [no-confusing-arrow] is no longer a special rule, but simply
271-
turned off, since recent Prettier versions make it redundant.
272-
- Improved: The CLI helper tool now has a more helpful message for special
273-
rules, and exits with a different status code if only special rules were
274-
found. The exit codes are now documented as well.
207+
- Changed: The [no-confusing-arrow] is no longer a special rule, but simply turned off, since recent Prettier versions make it redundant.
208+
- Improved: The CLI helper tool now has a more helpful message for special rules, and exits with a different status code if only special rules were found. The exit codes are now documented as well.
275209

276210
### Version 1.6.0 (2017-04-05)
277211

@@ -283,26 +217,20 @@
283217

284218
### Version 1.4.1 (2017-02-28)
285219

286-
- Improved: eslint-config-prettier is now part of the [prettier] organization!
287-
This version updates all URLs to point to the new home of the project.
220+
- Improved: eslint-config-prettier is now part of the [prettier] organization! This version updates all URLs to point to the new home of the project.
288221

289222
### Version 1.4.0 (2017-02-26)
290223

291-
- Added: The [no-confusing-arrow] rule (as a
292-
[special rule][no-confusing-arrow-special]). Thanks to Dominik Ferber
293-
(@dferber90)!
294-
- Added: Deprecated or removed rules that might conflict with prettier. Thanks
295-
to Dominik Ferber (@dferber90)!
224+
- Added: The [no-confusing-arrow] rule (as a [special rule][no-confusing-arrow-special]). Thanks to Dominik Ferber (@dferber90)!
225+
- Added: Deprecated or removed rules that might conflict with prettier. Thanks to Dominik Ferber (@dferber90)!
296226

297227
### Version 1.3.0 (2017-02-21)
298228

299-
- Added: The [template-tag-spacing] rule. Thanks to Thibault Derousseaux
300-
(@tibdex)!
229+
- Added: The [template-tag-spacing] rule. Thanks to Thibault Derousseaux (@tibdex)!
301230

302231
### Version 1.2.0 (2017-02-14)
303232

304-
- Added: The [one-var-declaration-per-line] rule. Thanks to Ruben Oostinga
305-
(@0xR)!
233+
- Added: The [one-var-declaration-per-line] rule. Thanks to Ruben Oostinga (@0xR)!
306234

307235
### Version 1.1.1 (2017-02-12)
308236

@@ -311,8 +239,7 @@
311239
### Version 1.1.0 (2017-02-10)
312240

313241
- Fixed: The [eslint-plugin-react] exclusion rules now actually work.
314-
- Fixed: The CLI helper tool now works in Node.js 4. Thanks to Nathan Friedly
315-
(@nfriedly)!
242+
- Fixed: The CLI helper tool now works in Node.js 4. Thanks to Nathan Friedly (@nfriedly)!
316243
- Added: Support for [eslint-plugin-flowtype].
317244
- Improved: Minor things for the CLI helper tool.
318245
- Improved: There are now tests for everything.

0 commit comments

Comments
 (0)