Fix override for gjs files in recommended config (#2891)

ember-template-lint · May 23, 2023 · a8344ed · a8344ed
1 parent 6691643
commit a8344ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/get-config.js b/lib/get-config.js
@@ -277,6 +277,7 @@ async function processLoadedConfigurations(workingDir, config, options) {
 function processExtends(config) {
   let extendedList = normalizeExtends(config);
   let extendedRules = {};
+  let extendedOverrides = [];
 
   if (extendedList) {
     for (const extendName of extendedList) {
@@ -291,6 +292,10 @@ function processExtends(config) {
 
           delete configuration.loadedConfigurations;
 
+          if (configuration.overrides) {
+            extendedOverrides = [...extendedOverrides, ...configuration.overrides];
+          }
+
           if (configuration.rules) {
             extendedRules = Object.assign({}, extendedRules, configuration.rules);
           } else {
@@ -305,6 +310,7 @@ function processExtends(config) {
     }
 
     config.rules = Object.assign({}, extendedRules, config.rules);
+    config.overrides = [...extendedOverrides, ...(config.overrides || [])];
   }
 }
 

diff --git a/test/unit/get-config-test.js b/test/unit/get-config-test.js
@@ -174,6 +174,7 @@ describe('get-config', function () {
     });
 
     expect(actual.rules['no-debugger']).toEqual({ config: true, severity: 2 });
+    expect(actual.overrides[0]?.files).toEqual(['**/*.gjs', '**/*.gts']);
   });
 
   it('can extend and override a default configuration', async function () {