Skip to content

Commit edfc155

Browse files
alan-agius4hansl
authored andcommitted
feat(@schematics/angular): rename tsconfig.e2e.json to tsconfig.json
This will help IDEs as they only pick up the standard name
1 parent 3cbc763 commit edfc155

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

packages/schematics/angular/e2e/files/protractor.conf.js.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exports.config = {
2121
},
2222
onPrepare() {
2323
require('ts-node').register({
24-
project: require('path').join(__dirname, './tsconfig.e2e.json')
24+
project: require('path').join(__dirname, './tsconfig.json')
2525
});
2626
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
2727
}

packages/schematics/angular/e2e/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function AddBuilderToWorkspace(options: E2eOptions, workspace: WorkspaceSchema):
5454
const lintConfig = architect.lint;
5555
if (lintConfig) {
5656
lintConfig.options.tsConfig =
57-
lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.e2e.json`);
57+
lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.json`);
5858
}
5959

6060
workspace.projects[options.relatedAppName] = project;

packages/schematics/angular/e2e/index_spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('Application Schematic', () => {
4747
const files = tree.files;
4848
expect(files).toEqual(jasmine.arrayContaining([
4949
'/projects/foo/e2e/protractor.conf.js',
50-
'/projects/foo/e2e/tsconfig.e2e.json',
50+
'/projects/foo/e2e/tsconfig.json',
5151
'/projects/foo/e2e/src/app.e2e-spec.ts',
5252
'/projects/foo/e2e/src/app.po.ts',
5353
]));
@@ -96,7 +96,7 @@ describe('Application Schematic', () => {
9696
expect(lintOptions.tsConfig).toEqual([
9797
'projects/foo/tsconfig.app.json',
9898
'projects/foo/tsconfig.spec.json',
99-
'projects/foo/e2e/tsconfig.e2e.json',
99+
'projects/foo/e2e/tsconfig.json',
100100
]);
101101
});
102102
});

packages/schematics/angular/ng-new/index_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('Ng New Schematic', () => {
3939
'/bar/src/app/app.module.ts',
4040
'/bar/e2e/src/app.po.ts',
4141
'/bar/e2e/src/app.e2e-spec.ts',
42-
'/bar/e2e/tsconfig.e2e.json',
42+
'/bar/e2e/tsconfig.json',
4343
'/bar/e2e/protractor.conf.js',
4444
]));
4545
});

0 commit comments

Comments
 (0)