Merge pull request #70 from ember-template-lint/drop-tl-1

Drop support for ember-template-lint@1

Author: dcyriller

.travis.yml

@@ -32,7 +32,7 @@ jobs:
 
   include:
     - stage: "Tests"
-      name: "ember-template-lint 1.6.1"
+      name: "ember-template-lint 2.1.0"
       install: yarn install --frozen-lockfile --non-interactive
 
     - name: "ember-template-lint latest"

lib/rules/prettier.js

@@ -20,7 +20,7 @@ function isFile(loc) {
 module.exports = class Prettier extends Rule {
   constructor(options) {
     super(options);
-    this.filePath = options.moduleName + ".hbs";
+    this.filePath = options.filePath;
   }
 
   visitor() {
@@ -38,15 +38,7 @@ module.exports = class Prettier extends Rule {
           }
 
           const source = this.sourceForNode(node);
-          // Following
-          // https://github.com/ember-template-lint/ember-template-lint/commit/a7bf55cf36ee90d0460e7cb94e7ca4731aaa4be7
-          // `templateEnvironmentData` is deprecated (in v1.8.0).
-          // This code aims at remaining compatible with
-          // ember-template-lint@>=1.3.0. The ternary might be removed when
-          // upgrading the peerDependency to ember-template-lint@2.
-          let filepath = this.filePath
-            ? this.filePath
-            : this.templateEnvironmentData.moduleName + ".hbs";
+          let filepath = this.filePath;
 
           if (!prettier) {
             // Prettier is expensive to load, so only load it if needed.

package.json

@@ -26,11 +26,11 @@
   "license": "Apache-2.0",
   "private": false,
   "peerDependencies": {
-    "ember-template-lint": "^1.6.1",
+    "ember-template-lint": "^2.1.0",
     "prettier": "^1.18.2"
   },
   "devDependencies": {
-    "ember-template-lint": "^1.6.1",
+    "ember-template-lint": "^2.1.0",
     "eslint": "^6.0.1",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-node": "^11.0.0",

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

@@ -30,7 +30,7 @@ test
       config: true,
       template: "{{#my-component}}{{/my-component}}\n",
       result: {
-        moduleId: "layout.hbs",
+        moduleId: "layout",
         message: "Delete `⏎`",
         line: 1,
         column: 34,
@@ -41,7 +41,7 @@ test
       config: true,
       template: "test\n",
       result: {
-        moduleId: "layout.hbs",
+        moduleId: "layout",
         message: "Delete `⏎`",
         line: 1,
         column: 4,
@@ -56,7 +56,7 @@ test
 
 {{/my-component}}`,
       result: {
-        moduleId: "layout.hbs",
+        moduleId: "layout",
         message: "Replace `⏎test⏎` with `  test`",
         line: 1,
         column: 18,
@@ -70,7 +70,7 @@ test
 
 {{/my-component}}`,
       result: {
-        moduleId: "layout.hbs",
+        moduleId: "layout",
         message: "Delete `⏎`",
         line: 2,
         column: 7,