Merge pull request #259 from patricklx/patch-2

ember-template-lint · Jun 16, 2023 · bff5cb8 · bff5cb8
2 parents c9e0f97 + 620d1d0
commit bff5cb8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,10 @@ module.exports = {
 
 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).
 
+## Configuration
+
+Prettier can be configured via [standard prettier config files](https://prettier.io/docs/en/configuration.html).
+
 ## Tips
 
 You may want to define these two scripts in your package.json:

diff --git a/lib/rules/prettier.js b/lib/rules/prettier.js
@@ -21,6 +21,23 @@ export default class Prettier extends Rule {
     this.filePath = options.filePath;
   }
 
+  getPrettierOptions() {
+    let filepath = this.filePath;
+
+    if (!prettier) {
+      // Prettier is expensive to load, so only load it if needed.
+      prettier = require("prettier");
+    }
+
+    const prettierRcOptions = prettier.resolveConfig.sync(filepath, {
+      editorconfig: true,
+    });
+
+    return Object.assign({}, { parser: "glimmer" }, prettierRcOptions, {
+      filepath,
+    });
+  }
+
   visitor() {
     return {
       Program: {
@@ -36,35 +53,20 @@ export default class Prettier extends Rule {
           }
 
           const source = this.sourceForNode(node);
-          let filepath = this.filePath;
-
-          if (!prettier) {
-            // Prettier is expensive to load, so only load it if needed.
-            prettier = require("prettier");
-          }
-
-          const prettierRcOptions = prettier.resolveConfig.sync(filepath, {
-            editorconfig: true,
-          });
+          const prettierOptions = this.getPrettierOptions();
 
-          const prettierFileInfo = prettier.getFileInfo.sync(filepath, {
-            ignorePath: ".prettierignore",
-          });
+          const prettierFileInfo = prettier.getFileInfo.sync(
+            prettierOptions.filepath,
+            {
+              ignorePath: ".prettierignore",
+            }
+          );
 
           // Skip if file is ignored using a .prettierignore file
           if (prettierFileInfo.ignored) {
             return;
           }
 
-          const prettierOptions = Object.assign(
-            {},
-            { parser: "glimmer" },
-            prettierRcOptions,
-            {
-              filepath,
-            }
-          );
-
           let prettierSource;
           try {
             prettierSource = prettier.format(source, prettierOptions);