Skip to content

Commit 09daf7a

Browse files
alan-agius4clydin
authored andcommitted
fix(@schematics/angular): remove leftover workspace tslint config
1 parent 6916bc9 commit 09daf7a

File tree

4 files changed

+1
-146
lines changed

4 files changed

+1
-146
lines changed

packages/schematics/angular/workspace/files/tslint.json.template

Lines changed: 0 additions & 140 deletions
This file was deleted.

packages/schematics/angular/workspace/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import { Schema as WorkspaceOptions } from './schema';
2020

2121

2222
export default function (options: WorkspaceOptions): Rule {
23-
const minimalFilesRegExp = /(.editorconfig|tslint.json)\.template$/;
24-
2523
return mergeWith(apply(url('./files'), [
26-
options.minimal ? filter(path => !minimalFilesRegExp.test(path)) : noop(),
24+
options.minimal ? filter(path => !path.endsWith('editorconfig.template')) : noop(),
2725
applyTemplates({
2826
utils: strings,
2927
...options,

packages/schematics/angular/workspace/index_spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ describe('Workspace Schematic', () => {
3333
'/package.json',
3434
'/README.md',
3535
'/tsconfig.json',
36-
'/tslint.json',
3736
]));
3837
});
3938

@@ -69,7 +68,6 @@ describe('Workspace Schematic', () => {
6968
'/tsconfig.json',
7069
]));
7170

72-
expect(files).not.toContain('/tslint.json');
7371
expect(files).not.toContain('/.editorconfig');
7472
});
7573

tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export default function() {
1515
.then(() => expectFileNotToExist('protractor.conf.js'))
1616
.then(() => expectFileNotToExist('src/test.ts'))
1717
.then(() => expectFileNotToExist('tsconfig.spec.json'))
18-
.then(() => expectFileNotToExist('tslint.json'))
1918
.then(() => expectFileNotToExist('src/app/app.component.html'))
2019
.then(() => expectFileNotToExist('src/app/app.component.css'))
2120
.then(() => expectFileNotToExist('src/app/app.component.spec.ts'))

0 commit comments

Comments
 (0)