fix(@schematics/angular): remove leftover workspace tslint config

angular · Mar 22, 2021 · 09daf7a · 09daf7a
1 parent 6916bc9
commit 09daf7a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 146 deletions.
diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
@@ -20,10 +20,8 @@ import { Schema as WorkspaceOptions } from './schema';
 
 
 export default function (options: WorkspaceOptions): Rule {
-  const minimalFilesRegExp = /(.editorconfig|tslint.json)\.template$/;
-
   return mergeWith(apply(url('./files'), [
-    options.minimal ? filter(path => !minimalFilesRegExp.test(path)) : noop(),
+    options.minimal ? filter(path => !path.endsWith('editorconfig.template')) : noop(),
     applyTemplates({
       utils: strings,
       ...options,

diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts
@@ -33,7 +33,6 @@ describe('Workspace Schematic', () => {
       '/package.json',
       '/README.md',
       '/tsconfig.json',
-      '/tslint.json',
     ]));
   });
 
@@ -69,7 +68,6 @@ describe('Workspace Schematic', () => {
       '/tsconfig.json',
     ]));
 
-    expect(files).not.toContain('/tslint.json');
     expect(files).not.toContain('/.editorconfig');
   });
 

diff --git a/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts b/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts
@@ -15,7 +15,6 @@ export default function() {
       .then(() => expectFileNotToExist('protractor.conf.js'))
       .then(() => expectFileNotToExist('src/test.ts'))
       .then(() => expectFileNotToExist('tsconfig.spec.json'))
-      .then(() => expectFileNotToExist('tslint.json'))
       .then(() => expectFileNotToExist('src/app/app.component.html'))
       .then(() => expectFileNotToExist('src/app/app.component.css'))
       .then(() => expectFileNotToExist('src/app/app.component.spec.ts'))