Address PR review feedback

- Revert recommended.mjs to original (cannot change recommended config)
- Keep noop processor unchanged; export template-lint-disable as a
  separate processor (ember/template-lint-disable) to avoid breaking
  existing gjs/gts users
- Wire hbs files to use the new processor by default in base configs
  (hbs had no prior config, so this is additive)
- Move hbs tests to a separate hbs-parser-test.js file
- Update gjs template-lint-disable tests to explicitly use the new
  processor via initESLintWithTemplateLintDisable()

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

Author: NullVoxPopuli

lib/config-legacy/base.js

@@ -26,7 +26,7 @@ module.exports = {
     {
       files: ['**/*.hbs'],
       parser: 'ember-eslint-parser/hbs',
-      processor: 'ember/noop',
+      processor: 'ember/template-lint-disable',
     },
   ],
 };

lib/config/base.js

@@ -23,6 +23,6 @@ module.exports = [
     languageOptions: {
       parser: emberEslintParserHbs,
     },
-    processor: 'ember/noop',
+    processor: 'ember/template-lint-disable',
   },
 ];

lib/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const requireIndex = require('requireindex');
+const noop = require('ember-eslint-parser/noop');
 const templateLintDisableProcessor = require('./processors/template-lint-disable');
 const pkg = require('../package.json'); // eslint-disable-line import/extensions
 
@@ -16,6 +17,7 @@ module.exports = {
   },
   processors: {
     // https://eslint.org/docs/developer-guide/working-with-plugins#file-extension-named-processor
-    noop: templateLintDisableProcessor,
+    noop,
+    'template-lint-disable': templateLintDisableProcessor,
   },
 };

lib/recommended.mjs

@@ -3,11 +3,9 @@ import baseRules from './recommended-rules.js';
 import gjsRules from './recommended-rules-gjs.js';
 import gtsRules from './recommended-rules-gts.js';
 import emberParser from 'ember-eslint-parser';
-import emberParserHbs from 'ember-eslint-parser/hbs';
 
 export const plugin = emberPlugin;
 export const parser = emberParser;
-export const hbsParser = emberParserHbs;
 
 export const base = {
   name: 'ember:base',
@@ -55,29 +53,14 @@ export const gts = {
   },
 };
 
-export const hbs = {
-  name: 'ember:hbs',
-  plugins: { ember: emberPlugin },
-  files: ['**/*.hbs'],
-  languageOptions: {
-    parser: emberParserHbs,
-  },
-  processor: 'ember/noop',
-  rules: {
-    ...base.rules,
-  },
-};
-
 export default {
   // Helpful utility exports
   plugin,
   parser,
-  hbsParser,
   // Recommended config sets
   configs: {
     base,
     gjs,
     gts,
-    hbs,
   },
 };

tests/lib/rules-preprocessor/gjs-gts-parser-test.js

@@ -13,7 +13,6 @@ const { writeFileSync, readFileSync } = require('node:fs');
 const { join } = require('node:path');
 
 const gjsGtsParser = require.resolve('ember-eslint-parser');
-const hbsParser = require.resolve('ember-eslint-parser/hbs');
 
 /**
  * Helper function which creates ESLint instance with enabled/disabled autofix feature.
@@ -888,9 +887,35 @@ describe('multiple tokens in same file', () => {
   });
 });
 
+function initESLintWithTemplateLintDisable() {
+  return new ESLint({
+    ignore: false,
+    useEslintrc: false,
+    plugins: { ember: plugin },
+    overrideConfig: {
+      root: true,
+      env: {
+        browser: true,
+      },
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
+      },
+      parser: gjsGtsParser,
+      plugins: ['ember'],
+      processor: 'ember/template-lint-disable',
+      rules: {
+        'no-undef': 'error',
+        'no-unused-vars': 'error',
+        quotes: ['error', 'single'],
+      },
+    },
+  });
+}
+
 describe('supports template-lint-disable directive', () => {
   it('disables all rules on the next line with mustache comment', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -906,7 +931,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('disables all rules on the next line with mustache block comment', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -921,7 +946,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('disables a specific rule by eslint rule name', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -940,7 +965,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('only disables the next line, not subsequent lines', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -958,7 +983,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('does not suppress unrelated rules when a specific rule is named', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -975,7 +1000,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -990,7 +1015,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('supports multiple rule names', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -1005,7 +1030,7 @@ describe('supports template-lint-disable directive', () => {
   });
 
   it('works with multiple disable comments in the same file', async () => {
-    const eslint = initESLint();
+    const eslint = initESLintWithTemplateLintDisable();
     const code = `
     <template>
       <div>
@@ -1022,123 +1047,3 @@ describe('supports template-lint-disable directive', () => {
   });
 });
 
-function initHbsESLint() {
-  return new ESLint({
-    ignore: false,
-    useEslintrc: false,
-    plugins: { ember: plugin },
-    overrideConfig: {
-      root: true,
-      parserOptions: {
-        ecmaVersion: 2022,
-        sourceType: 'module',
-      },
-      plugins: ['ember'],
-      overrides: [
-        {
-          files: ['**/*.hbs'],
-          parser: hbsParser,
-          processor: 'ember/noop',
-          rules: {
-            'ember/template-no-bare-strings': 'error',
-          },
-        },
-      ],
-    },
-  });
-}
-
-describe('supports template-lint-disable directive in hbs files', () => {
-  it('disables all rules on the next line with mustache comment', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('disables all rules on the next line with mustache block comment', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{!-- template-lint-disable --}}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('only disables the next line, not subsequent lines', async () => {
-    const eslint = initHbsESLint();
-    const code = `{{! template-lint-disable }}
-<div>Hello world</div>
-<div>Bare string here too</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    // Line 2 "Hello world" suppressed, but line 3 "Bare string here too" should still error
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].line).toBe(3);
-  });
-
-  it('disables a specific rule by name', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable ember/template-no-bare-strings }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('supports template-lint rule name format (maps to ember/ prefix)', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable no-bare-strings }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('does not suppress unrelated rules when a specific rule is named', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable ember/template-no-html-comments }}
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    // no-bare-strings should still fire since we only disabled no-html-comments
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
-  });
-
-  it('works with multiple disable comments in the same file', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  {{! template-lint-disable }}
-  Hello world
-  {{! template-lint-disable }}
-  Another bare string
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(0);
-  });
-
-  it('bare strings without disable comment still trigger errors', async () => {
-    const eslint = initHbsESLint();
-    const code = `<div>
-  Hello world
-</div>`;
-    const results = await eslint.lintText(code, { filePath: 'my-template.hbs' });
-    const resultErrors = results.flatMap((result) => result.messages);
-    expect(resultErrors).toHaveLength(1);
-    expect(resultErrors[0].ruleId).toBe('ember/template-no-bare-strings');
-  });
-});