feat(@schematics/angular): rename tsconfig.e2e.json to tsconfig.json

This will help IDEs as they only pick up the standard name
angular · Mar 4, 2019 · edfc155 · edfc155
1 parent 3cbc763
commit edfc155
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/packages/schematics/angular/e2e/files/protractor.conf.js.template b/packages/schematics/angular/e2e/files/protractor.conf.js.template
@@ -21,7 +21,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }

diff --git a/...ular/e2e/files/tsconfig.e2e.json.template → .../angular/e2e/files/tsconfig.json.template b/...ular/e2e/files/tsconfig.e2e.json.template → .../angular/e2e/files/tsconfig.json.template
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
@@ -54,7 +54,7 @@ function AddBuilderToWorkspace(options: E2eOptions, workspace: WorkspaceSchema):
       const lintConfig = architect.lint;
       if (lintConfig) {
         lintConfig.options.tsConfig =
-          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.e2e.json`);
+          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.json`);
       }
 
       workspace.projects[options.relatedAppName] = project;

diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
@@ -47,7 +47,7 @@ describe('Application Schematic', () => {
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/foo/e2e/protractor.conf.js',
-      '/projects/foo/e2e/tsconfig.e2e.json',
+      '/projects/foo/e2e/tsconfig.json',
       '/projects/foo/e2e/src/app.e2e-spec.ts',
       '/projects/foo/e2e/src/app.po.ts',
     ]));
@@ -96,7 +96,7 @@ describe('Application Schematic', () => {
       expect(lintOptions.tsConfig).toEqual([
         'projects/foo/tsconfig.app.json',
         'projects/foo/tsconfig.spec.json',
-        'projects/foo/e2e/tsconfig.e2e.json',
+        'projects/foo/e2e/tsconfig.json',
       ]);
     });
   });

diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
@@ -39,7 +39,7 @@ describe('Ng New Schematic', () => {
       '/bar/src/app/app.module.ts',
       '/bar/e2e/src/app.po.ts',
       '/bar/e2e/src/app.e2e-spec.ts',
-      '/bar/e2e/tsconfig.e2e.json',
+      '/bar/e2e/tsconfig.json',
       '/bar/e2e/protractor.conf.js',
     ]));
   });