Skip to content

Commit 22febc5

Browse files
authored
Merge pull request #274 from bertdeblock/support-prettier-v3
Support Prettier v3
2 parents a8d55d6 + 5f85cba commit 22febc5

4 files changed

Lines changed: 170 additions & 21 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ error: Replace `New·Addons</h1>` with <h1>⏎New Addons⏎</h1>` (prettier/pret
2020

2121
- [Node.js](https://nodejs.org/) `^16.0.0 || ^18.0.0 || >=20.0.0`
2222
- [ember-template-lint](https://github.com/ember-template-lint/ember-template-lint/) `>=4.0.0`
23-
- [prettier](https://prettier.io/) `>=1.18.1`
23+
- [prettier](https://prettier.io/) `>=3.0.0`
2424

2525
Note: ember-template-lint-plugin-prettier@3 is compatible with older versions of
2626
ember-template-lint, in particular ember-template-lint@3.

lib/rules/prettier.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ export default class Prettier extends Rule {
2626

2727
if (!prettier) {
2828
// Prettier is expensive to load, so only load it if needed.
29-
prettier = require("prettier");
29+
prettier = require("@prettier/sync");
3030
}
3131

32-
const prettierRcOptions = prettier.resolveConfig.sync(filepath, {
32+
const prettierRcOptions = prettier.resolveConfig(filepath, {
3333
editorconfig: true,
3434
});
3535

@@ -55,11 +55,11 @@ export default class Prettier extends Rule {
5555
const source = this.sourceForNode(node);
5656
const prettierOptions = this.getPrettierOptions();
5757

58-
const prettierFileInfo = prettier.getFileInfo.sync(
58+
const prettierFileInfo = prettier.getFileInfo(
5959
prettierOptions.filepath,
6060
{
6161
ignorePath: ".prettierignore",
62-
}
62+
},
6363
);
6464

6565
// Skip if file is ignored using a .prettierignore file
@@ -118,23 +118,23 @@ export default class Prettier extends Rule {
118118
let { line, column } = getLocFromIndex(offset, this.source);
119119
let { line: endLine, column: endColumn } = getLocFromIndex(
120120
offset + deleteText.length,
121-
this.source
121+
this.source,
122122
);
123123

124124
switch (difference.operation) {
125125
case INSERT:
126126
message = `Insert \`${showInvisibles(
127-
difference.insertText
127+
difference.insertText,
128128
)}\``;
129129
break;
130130
case DELETE:
131131
message = `Delete \`${showInvisibles(
132-
difference.deleteText
132+
difference.deleteText,
133133
)}\``;
134134
break;
135135
case REPLACE:
136136
message = `Replace \`${showInvisibles(
137-
difference.deleteText
137+
difference.deleteText,
138138
)}\` with \`${showInvisibles(difference.insertText)}\``;
139139
break;
140140
}

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"test": "mocha --recursive"
3131
},
3232
"dependencies": {
33+
"@prettier/sync": "^0.2.1",
3334
"prettier-linter-helpers": "^1.0.0"
3435
},
3536
"devDependencies": {
@@ -38,17 +39,17 @@
3839
"eslint": "^8.2.0",
3940
"eslint-config-prettier": "^8.3.0",
4041
"eslint-plugin-node": "^11.0.0",
41-
"eslint-plugin-prettier": "^4.0.0",
42+
"eslint-plugin-prettier": "^5.0.0",
4243
"lerna-changelog": "^2.1.0",
4344
"markdownlint-cli": "^0.33.0",
4445
"mocha": "^10.1.0",
4546
"npm-run-all": "^4.1.5",
46-
"prettier": "^2.3.1",
47+
"prettier": "^3.0.0",
4748
"release-it": "^15.5.0"
4849
},
4950
"peerDependencies": {
5051
"ember-template-lint": ">= 4.0.0",
51-
"prettier": ">= 1.18.1"
52+
"prettier": ">= 3.0.0"
5253
},
5354
"engines": {
5455
"node": "^16.0.0 || ^18.0.0 || >=20.0.0"
@@ -72,7 +73,7 @@
7273
}
7374
},
7475
"volta": {
75-
"node": "16.13.1",
76+
"node": "16.20.1",
7677
"yarn": "1.22.17"
7778
}
7879
}

0 commit comments

Comments
 (0)