Skip to content

Commit 29c0506

Browse files
BPScottnot-an-aardvark
authored andcommitted
Breaking: Update minimum required pretter version to 1.13.0
This lets us remove some conditional checks for some APIs that we now know will be present. This shall also allow us to drop pragma support as people can use the native pragma suppport in prettier (to be done in a later commit).
1 parent be460bd commit 29c0506

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

eslint-plugin-prettier.js

+9-16
Original file line numberDiff line numberDiff line change
@@ -399,22 +399,15 @@ module.exports = {
399399
? FB_PRETTIER_OPTIONS
400400
: context.options[0];
401401

402-
const prettierRcOptions =
403-
usePrettierrc &&
404-
prettier.resolveConfig &&
405-
prettier.resolveConfig.sync
406-
? prettier.resolveConfig.sync(filepath, {
407-
editorconfig: true
408-
})
409-
: null;
410-
411-
// prettier.getFileInfo was added in v1.13
412-
const prettierFileInfo =
413-
prettier.getFileInfo && prettier.getFileInfo.sync
414-
? prettier.getFileInfo.sync(filepath, {
415-
ignorePath: '.prettierignore'
416-
})
417-
: { ignored: false, inferredParser: null };
402+
const prettierRcOptions = usePrettierrc
403+
? prettier.resolveConfig.sync(filepath, {
404+
editorconfig: true
405+
})
406+
: null;
407+
408+
const prettierFileInfo = prettier.getFileInfo.sync(filepath, {
409+
ignorePath: '.prettierignore'
410+
});
418411

419412
// Skip if file is ignored using a .prettierignore file
420413
if (prettierFileInfo.ignored) {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"jest-docblock": "^21.0.0"
3333
},
3434
"peerDependencies": {
35-
"prettier": ">= 0.11.0"
35+
"prettier": ">= 1.13.0"
3636
},
3737
"devDependencies": {
3838
"@not-an-aardvark/node-release-script": "^0.1.0",

0 commit comments

Comments
 (0)