cleanup(angular): remove tsconfig.spec.json handling from application…

… generator (#15731)

packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap

@@ -502,7 +502,7 @@ Object {
 }
 `;
 
-exports[`app not nested should generate files 1`] = `
+exports[`app not nested should generate files: e2e tsconfig.json 1`] = `
 Object {
   "compilerOptions": Object {
     "allowJs": true,
@@ -527,3 +527,59 @@ Object {
   ],
 }
 `;
+
+exports[`app not nested should generate files: tsconfig.app.json 1`] = `
+Object {
+  "compilerOptions": Object {
+    "outDir": "../../dist/out-tsc",
+    "types": Array [],
+  },
+  "exclude": Array [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+  ],
+  "extends": "./tsconfig.json",
+  "files": Array [
+    "src/main.ts",
+  ],
+  "include": Array [
+    "src/**/*.d.ts",
+  ],
+}
+`;
+
+exports[`app not nested should generate files: tsconfig.json 1`] = `
+Object {
+  "angularCompilerOptions": Object {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true,
+  },
+  "compilerOptions": Object {
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "strict": true,
+    "target": "es2022",
+    "useDefineForClassFields": false,
+  },
+  "extends": "../../tsconfig.base.json",
+  "files": Array [],
+  "include": Array [],
+  "references": Array [
+    Object {
+      "path": "./tsconfig.app.json",
+    },
+    Object {
+      "path": "./tsconfig.spec.json",
+    },
+    Object {
+      "path": "./tsconfig.editor.json",
+    },
+  ],
+}
+`;

packages/angular/src/generators/application/application.spec.ts

@@ -107,27 +107,14 @@ describe('app', () => {
         appTree.read('apps/my-app/src/app/app.module.ts', 'utf-8')
       ).toContain('class AppModule');
 
-      const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json');
-      expect(tsconfig.references).toContainEqual({
-        path: './tsconfig.app.json',
-      });
-      expect(tsconfig.references).toContainEqual({
-        path: './tsconfig.spec.json',
-      });
-      expect(tsconfig.references).toContainEqual({
-        path: './tsconfig.editor.json',
-      });
+      expect(readJson(appTree, 'apps/my-app/tsconfig.json')).toMatchSnapshot(
+        'tsconfig.json'
+      );
 
       const tsconfigApp = parseJson(
         appTree.read('apps/my-app/tsconfig.app.json', 'utf-8')
       );
-      expect(tsconfigApp.compilerOptions.outDir).toEqual('../../dist/out-tsc');
-      expect(tsconfigApp.extends).toEqual('./tsconfig.json');
-      expect(tsconfigApp.exclude).toEqual([
-        'jest.config.ts',
-        'src/**/*.test.ts',
-        'src/**/*.spec.ts',
-      ]);
+      expect(tsconfigApp).toMatchSnapshot('tsconfig.app.json');
 
       const eslintrcJson = parseJson(
         appTree.read('apps/my-app/.eslintrc.json', 'utf-8')
@@ -138,7 +125,7 @@ describe('app', () => {
       const tsconfigE2E = parseJson(
         appTree.read('apps/my-app-e2e/tsconfig.json', 'utf-8')
       );
-      expect(tsconfigE2E).toMatchSnapshot();
+      expect(tsconfigE2E).toMatchSnapshot('e2e tsconfig.json');
     });
 
     it('should setup jest with serializers', async () => {
@@ -586,6 +573,15 @@ describe('app', () => {
           `'jest-preset-angular/build/serializers/html-comment'`
         );
       });
+
+      it('should add reference to tsconfig.spec.json to tsconfig.json', async () => {
+        await generateApp(appTree);
+
+        const { references } = readJson(appTree, 'apps/my-app/tsconfig.json');
+        expect(
+          references.find((r) => r.path.includes('tsconfig.spec.json'))
+        ).toBeTruthy();
+      });
     });
 
     describe('none', () => {
@@ -604,6 +600,11 @@ describe('app', () => {
         expect(
           readProjectConfiguration(appTree, 'my-app').targets.test
         ).toBeUndefined();
+        // check tsconfig.spec.json is not referenced
+        const { references } = readJson(appTree, 'apps/my-app/tsconfig.json');
+        expect(
+          references.every((r) => !r.path.includes('tsconfig.spec.json'))
+        ).toBe(true);
       });
     });
   });

packages/angular/src/generators/application/files/base/tsconfig.json__tpl__

@@ -8,12 +8,6 @@
   "references": [
     {
       "path": "./tsconfig.app.json"
-    },
-    <% if(unitTesting) { %>{
-      "path": "./tsconfig.spec.json"
-    },<% } %>
-    {
-      "path": "./tsconfig.editor.json"
     }
   ],
   "extends": "<%= rootTsConfig %>"

packages/angular/src/generators/application/lib/create-files.ts

@@ -110,12 +110,6 @@ export async function createFiles(
     );
   }
 
-  if (options.unitTestRunner === UnitTestRunner.None) {
-    tree.delete(
-      joinPathFragments(options.appProjectRoot, 'tsconfig.spec.json')
-    );
-  }
-
   if (options.inlineTemplate) {
     tree.delete(
       joinPathFragments(options.appProjectRoot, '/src/app/app.component.html')

packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap

@@ -7,9 +7,9 @@ Array [
   "tsconfig.app.json",
   "tsconfig.editor.json",
   "tsconfig.json",
-  "tsconfig.spec.json",
   ".eslintrc.json",
   "jest.config.ts",
+  "tsconfig.spec.json",
 ]
 `;