Skip to content

Commit 32cae19

Browse files
johnthagenljharb
authored andcommitted
[Docs] order: Remove duplicate mention of default
1 parent 2c33530 commit 32cae19

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CHANGELOG.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
1010
- `importType`: avoid crashing on a non-string' ([#2305], thanks [@ljharb])
1111

1212
### Changed
13-
- [`no-default-import`]: report on the token "default" instead of the entire node ([#2299], [@pmcelhaney])
13+
- [`no-default-import`]: report on the token "default" instead of the entire node ([#2299], thanks [@pmcelhaney])
14+
- [Docs] [`order`]: Remove duplicate mention of default ([#2280], thanks [@johnthagen])
1415

1516
## [2.25.3] - 2021-11-09
1617

@@ -948,14 +949,12 @@ for info on changes for earlier releases.
948949

949950
[`memo-parser`]: ./memo-parser/README.md
950951

951-
<<<<<<< HEAD
952952
[#2305]: https://github.com/import-js/eslint-plugin-import/pull/2305
953-
=======
954953
[#2299]: https://github.com/import-js/eslint-plugin-import/pull/2299
955-
>>>>>>> 374ce41e... [Fix] `no-default-import`: report on the token "default" instead of the entire node
956954
[#2297]: https://github.com/import-js/eslint-plugin-import/pull/2297
957955
[#2287]: https://github.com/import-js/eslint-plugin-import/pull/2287
958956
[#2282]: https://github.com/import-js/eslint-plugin-import/pull/2282
957+
[#2280]: https://github.com/import-js/eslint-plugin-import/pull/2280
959958
[#2279]: https://github.com/import-js/eslint-plugin-import/pull/2279
960959
[#2272]: https://github.com/import-js/eslint-plugin-import/pull/2272
961960
[#2271]: https://github.com/import-js/eslint-plugin-import/pull/2271

docs/rules/order.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,13 @@ The default value is `["builtin", "external"]`.
175175

176176
Enforces or forbids new lines between import groups:
177177

178-
- If set to `ignore`, no errors related to new lines between import groups will be reported (default).
178+
- If set to `ignore`, no errors related to new lines between import groups will be reported.
179179
- If set to `always`, at least one new line between each group will be enforced, and new lines inside a group will be forbidden. To prevent multiple lines between imports, core `no-multiple-empty-lines` rule can be used.
180180
- If set to `always-and-inside-groups`, it will act like `always` except newlines are allowed inside import groups.
181181
- If set to `never`, no new lines are allowed in the entire import section.
182182

183+
The default value is `"ignore"`.
184+
183185
With the default group setting, the following will be invalid:
184186

185187
```js

0 commit comments

Comments
 (0)