Merge pull request #127 from dmytro-krekota/master

Bump prettier and ember-template-lint (devDependencies)

Author: dcyriller

.eslintrc.js

@@ -3,22 +3,22 @@ module.exports = {
   extends: [
     "eslint:recommended",
     "plugin:node/recommended",
-    "plugin:prettier/recommended"
+    "plugin:prettier/recommended",
   ],
   plugins: ["prettier"],
   env: {
-    node: true
+    node: true,
   },
   rules: {
-    "prettier/prettier": ["error"]
+    "prettier/prettier": ["error"],
   },
 
   overrides: [
     {
       files: ["test/**/*-test.js", "test/helpers/rule-test-harness.js"],
       env: {
-        mocha: true
-      }
-    }
-  ]
+        mocha: true,
+      },
+    },
+  ],
 };

ember-template-lint-plugin-prettier.js

@@ -5,11 +5,11 @@ module.exports = {
 
   configurations: {
     recommended: {
-      rules: require("./lib/config/recommended")
-    }
+      rules: require("./lib/config/recommended"),
+    },
   },
 
   rules: {
-    prettier: PrettierRule
-  }
+    prettier: PrettierRule,
+  },
 };

lib/config/recommended.js

@@ -6,5 +6,5 @@ module.exports = {
   "block-indentation": false,
   "linebreak-style": false,
   quotes: false,
-  "self-closing-void-elements": false
+  "self-closing-void-elements": false,
 };

lib/rules/prettier.js

@@ -2,7 +2,7 @@
 
 const {
   showInvisibles,
-  generateDifferences
+  generateDifferences,
 } = require("prettier-linter-helpers");
 
 const getLocFromIndex = require("../utils/get-loc-from-index");
@@ -46,11 +46,11 @@ module.exports = class Prettier extends Rule {
           }
 
           const prettierRcOptions = prettier.resolveConfig.sync(filepath, {
-            editorconfig: true
+            editorconfig: true,
           });
 
           const prettierFileInfo = prettier.getFileInfo.sync(filepath, {
-            ignorePath: ".prettierignore"
+            ignorePath: ".prettierignore",
           });
 
           // Skip if file is ignored using a .prettierignore file
@@ -63,7 +63,7 @@ module.exports = class Prettier extends Rule {
             { parser: "glimmer" },
             prettierRcOptions,
             {
-              filepath
+              filepath,
             }
           );
 
@@ -92,7 +92,7 @@ module.exports = class Prettier extends Rule {
               message,
               line: node.loc && node.loc.start.line,
               column: node.loc && node.loc.start.column,
-              source
+              source,
             });
 
             return;
@@ -106,7 +106,7 @@ module.exports = class Prettier extends Rule {
 
             const differences = generateDifferences(source, prettierSource);
 
-            differences.forEach(difference => {
+            differences.forEach((difference) => {
               let message = "";
               let { line, column } = getLocFromIndex(
                 difference.offset,
@@ -134,8 +134,8 @@ module.exports = class Prettier extends Rule {
               this.log({ message, line, column, source, isFixable: true });
             });
           }
-        }
-      }
+        },
+      },
     };
   }
 };

lib/utils/get-loc-from-index.js

@@ -11,7 +11,7 @@ module.exports = function getLocFromIndex(index, lines) {
     cumulated += length;
     return {
       cumulated,
-      length
+      length,
     };
   });
 

package.json

@@ -32,7 +32,7 @@
     "prettier": ">=1.18.1"
   },
   "devDependencies": {
-    "ember-template-lint": "^2.10.0",
+    "ember-template-lint": "^3.4.2",
     "eslint": "^7.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-node": "^11.0.0",
@@ -41,7 +41,7 @@
     "markdownlint-cli": "^0.27.1",
     "mocha": "^8.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^1.19.0"
+    "prettier": "^2.3.1"
   },
   "engines": {
     "node": "10.* || 12.* || >= 14.*"

test/unit/rules/lint-prettier-test.js

@@ -22,7 +22,7 @@ test
 
 test
 
-{{/my-component}}`
+{{/my-component}}`,
   ],
 
   bad: [
@@ -31,13 +31,12 @@ test
       template: "{{#my-component}}{{/my-component}}\n",
       fixedTemplate: "{{#my-component}}{{/my-component}}",
       result: {
-        moduleId: "layout",
         message: "Delete `⏎`",
         line: 1,
         column: 34,
         source: "{{#my-component}}{{/my-component}}\n",
-        isFixable: true
-      }
+        isFixable: true,
+      },
     },
     {
       config: true,
@@ -48,29 +47,27 @@ test
       fixedTemplate: `<div data-foo data-bar="lol" some-other-thing={{haha-morethaneightychars}}>
 </div>`,
       result: {
-        moduleId: "layout",
         message: 'Replace `⏎·data-bar="lol"⏎·····` with ` data-bar="lol"`',
         line: 1,
         column: 13,
         source: `<div data-foo
  data-bar="lol"
       some-other-thing={{haha-morethaneightychars}}>
 </div>`,
-        isFixable: true
-      }
+        isFixable: true,
+      },
     },
     {
       config: true,
       template: "test\n",
       fixedTemplate: "test",
       result: {
-        moduleId: "layout",
         message: "Delete `⏎`",
         line: 1,
         column: 4,
         source: "test\n",
-        isFixable: true
-      }
+        isFixable: true,
+      },
     },
     {
       config: true,
@@ -80,35 +77,36 @@ test
 
 {{/my-component}}`,
       fixedTemplate: `{{#my-component}}
+
   test
+
 {{/my-component}}`,
       result: {
-        moduleId: "layout",
-        message: "Replace `⏎test⏎` with `  test`",
-        line: 1,
-        column: 18,
+        message: "Insert `··`",
+        line: 2,
+        column: 1,
         source: "{{#my-component}}\n\ntest\n\n{{/my-component}}",
-        isFixable: true
-      }
+        isFixable: true,
+      },
     },
     {
       config: true,
       template: `{{#my-component class="class1 class2"}}
-  test
+  test 
 
 {{/my-component}}`,
       fixedTemplate: `{{#my-component class="class1 class2"}}
   test
+
 {{/my-component}}`,
       result: {
-        moduleId: "layout",
-        message: "Delete `⏎`",
+        message: "Delete `·`",
         line: 2,
-        column: 7,
+        column: 6,
         source:
-          '{{#my-component class="class1 class2"}}\n  test\n\n{{/my-component}}',
-        isFixable: true
-      }
-    }
-  ]
+          '{{#my-component class="class1 class2"}}\n  test \n\n{{/my-component}}',
+        isFixable: true,
+      },
+    },
+  ],
 });

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

@@ -2,9 +2,9 @@
 const assert = require("assert");
 const getLocFromIndex = require("../../../lib/utils/get-loc-from-index");
 
-describe("getLocFromIndex()", function() {
-  describe("when end-of-file === newline", function() {
-    it("should compute the location (simplest case)", function() {
+describe("getLocFromIndex()", function () {
+  describe("when end-of-file === newline", function () {
+    it("should compute the location (simplest case)", function () {
       const index = 6;
       const lines = ["hey\n", "how\n", "are\n", "you\n", ""];
 
@@ -14,7 +14,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 2, "right column");
     });
 
-    it("should compute location (on first line)", function() {
+    it("should compute location (on first line)", function () {
       const index = 2;
       const lines = ["hey\n", "how\n", "are\n", "you\n", ""];
 
@@ -24,7 +24,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 2, "right column");
     });
 
-    it("should compute location (on first line's newline)", function() {
+    it("should compute location (on first line's newline)", function () {
       const index = 4;
       const lines = ["hey\n", "how\n", "are\n", "you\n", ""];
 
@@ -34,7 +34,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 4, "right column");
     });
 
-    it("should compute location (on last line)", function() {
+    it("should compute location (on last line)", function () {
       const index = 13;
       const lines = ["hey\n", "how\n", "are\n", "you\n", ""];
 
@@ -44,7 +44,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 1, "right column");
     });
 
-    it("should compute location (on last line's newline)", function() {
+    it("should compute location (on last line's newline)", function () {
       const index = 16;
       const lines = ["hey\n", "how\n", "are\n", "you\n", ""];
 
@@ -55,8 +55,8 @@ describe("getLocFromIndex()", function() {
     });
   });
 
-  describe("when end-of-file !== newline", function() {
-    it("should compute the location (simplest case)", function() {
+  describe("when end-of-file !== newline", function () {
+    it("should compute the location (simplest case)", function () {
       const index = 6;
       const lines = ["hey\n", "how\n", "are\n", "you"];
 
@@ -66,7 +66,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 2, "right column");
     });
 
-    it("should compute location (on first line)", function() {
+    it("should compute location (on first line)", function () {
       const index = 2;
       const lines = ["hey\n", "how\n", "are\n", "you"];
 
@@ -76,7 +76,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 2, "right column");
     });
 
-    it("should compute location (on first line's newline)", function() {
+    it("should compute location (on first line's newline)", function () {
       const index = 4;
       const lines = ["hey\n", "how\n", "are\n", "you"];
 
@@ -86,7 +86,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 4, "right column");
     });
 
-    it("should compute location (on last line)", function() {
+    it("should compute location (on last line)", function () {
       const index = 13;
       const lines = ["hey\n", "how\n", "are\n", "you"];
 
@@ -96,7 +96,7 @@ describe("getLocFromIndex()", function() {
       assert.equal(column, 1, "right column");
     });
 
-    it("should fallback on last character if index is out of range", function() {
+    it("should fallback on last character if index is out of range", function () {
       const index = 50;
       const lines = ["hey\n", "how\n", "are\n", "you"];