Skip to content

Commit 20a62dc

Browse files
authored
Merge pull request #52 from ember-template-lint/add-set
Add a recommended set of rules
2 parents 81c7cbe + d18f43f commit 20a62dc

7 files changed

Lines changed: 25 additions & 17 deletions

File tree

README.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,22 @@ yarn add -D prettier ember-template-lint-plugin-prettier
2424

2525
As peerDependencies, `prettier` and `ember-template-lint` will have to be installed in your project. Prettier version local to the project will be used (not any global one!).
2626

27-
Also, this plugin doesn't come with a recommended set of rules (that you often provide in the `extends` config key). At least for today! You'll have to enable them manually (see "Recommended configuration").
28-
2927
## Recommended configuration
3028

31-
You can merge your existing `.template-lintrc.js` configuration with this object:
29+
A recommended configuration is available. To use it, merge the following object
30+
to your `.templatelintrc.js` file:
3231

3332
```
3433
module.exports = {
3534
plugins: ["ember-template-lint-plugin-prettier"],
3635
37-
rules: {
38-
prettier: true, // turn this plugin's rule on
39-
40-
// if you use ember-template-lint's recommended set of rules
41-
// through `extends: "recommended"`,
42-
// these two rules need to be disabled
43-
// to let Prettier handle formatting
44-
"block-indentation": false,
45-
"self-closing-void-elements": false,
36+
extends: ["recommend", "ember-template-lint-plugin-prettier:recommended"],
4637
},
4738
};
4839
```
4940

41+
The recommended set will apply [these rules](https://github.com/ember-template-lint/ember-template-lint-plugin-prettier/blob/v1.1.0-beta.0/lib/config/recommended.js).
42+
5043
## Warnings
5144

5245
#### General

ember-template-lint-plugin-prettier.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
const PrettierRule = require("./rules/lint-prettier");
1+
const PrettierRule = require("./lib/rules/prettier");
22

33
module.exports = {
44
name: "ember-template-lint-plugin-prettier",
55

6+
configurations: {
7+
recommended: {
8+
rules: require("./lib/config/recommended")
9+
}
10+
},
11+
612
rules: {
713
prettier: PrettierRule
814
}

lib/config/recommended.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"use strict";
2+
3+
module.exports = {
4+
prettier: true,
5+
// ember-template-lint stylistic rules
6+
"block-indentation": false,
7+
"linebreak-style": false,
8+
quotes: false,
9+
"self-closing-void-elements": false
10+
};

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-template-lint-plugin-prettier",
3-
"version": "1.0.0",
3+
"version": "1.1.0-beta.0",
44
"description": "A prettier plugin for ember-template-lint",
55
"keywords": [
66
"ember-template-lint",
@@ -11,8 +11,7 @@
1111
],
1212
"files": [
1313
"ember-template-lint-plugin-prettier.js",
14-
"rules",
15-
"utils",
14+
"lib",
1615
"docs"
1716
],
1817
"main": "ember-template-lint-plugin-prettier.js",

test/unit/utils/get-loc-from-index-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint node/no-deprecated-api: 'off' */
22
const assert = require("assert");
3-
const getLocFromIndex = require("../../../utils/get-loc-from-index");
3+
const getLocFromIndex = require("../../../lib/utils/get-loc-from-index");
44

55
describe("getLocFromIndex()", function() {
66
describe("when end-of-file === newline", function() {

0 commit comments

Comments
 (0)