Merge pull request #10432 from bendemboski/ts-addon-declarations

Filter out tsconfig.declarations.json correctly
ember-cli · Feb 6, 2024 · d0e892a · d0e892a
2 parents 134a252 + 2004db8
commit d0e892a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/blueprints/addon/index.js b/blueprints/addon/index.js
@@ -218,7 +218,7 @@ module.exports = {
     }
 
     if (!options.typescript) {
-      addonFiles = addonFiles.filter((file) => file !== 'tsconfig.json' && !file.endsWith('.d.ts'));
+      addonFiles = addonFiles.filter((file) => !file.startsWith('tsconfig.') && !file.endsWith('.d.ts'));
     }
 
     return uniq(appFiles.concat(addonFiles));

diff --git a/tests/acceptance/new-test.js b/tests/acceptance/new-test.js
@@ -473,6 +473,7 @@ describe('Acceptance: ember new', function () {
       // no TypeScript files
       [
         'tsconfig.json',
+        'tsconfig.declarations.json',
         'app/config/environment.d.ts',
         'types/global.d.ts',
         'types/foo/index.d.ts',
@@ -511,7 +512,12 @@ describe('Acceptance: ember new', function () {
       expect(file('tests/dummy/app/index.html')).to.contain('<html>');
 
       // no TypeScript files
-      ['tsconfig.json', 'tests/dummy/app/config/environment.d.ts', 'types/global.d.ts'].forEach((filePath) => {
+      [
+        'tsconfig.json',
+        'tsconfig.declarations.json',
+        'tests/dummy/app/config/environment.d.ts',
+        'types/global.d.ts',
+      ].forEach((filePath) => {
         expect(file(filePath)).to.not.exist;
       });
     });