Skip to content

Commit

Permalink
fix(@schematics/angular): remove leftover workspace tslint config
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-agius4 authored and clydin committed Mar 22, 2021
1 parent 6916bc9 commit 09daf7a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 146 deletions.
140 changes: 0 additions & 140 deletions packages/schematics/angular/workspace/files/tslint.json.template

This file was deleted.

4 changes: 1 addition & 3 deletions packages/schematics/angular/workspace/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions packages/schematics/angular/workspace/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ describe('Workspace Schematic', () => {
'/package.json',
'/README.md',
'/tsconfig.json',
'/tslint.json',
]));
});

Expand Down Expand Up @@ -69,7 +68,6 @@ describe('Workspace Schematic', () => {
'/tsconfig.json',
]));

expect(files).not.toContain('/tslint.json');
expect(files).not.toContain('/.editorconfig');
});

Expand Down
1 change: 0 additions & 1 deletion tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down

0 comments on commit 09daf7a

Please sign in to comment.