fix(@schematics/angular): remove setting files tsconfig field with SSR/Server generation

The `files` field within the `tsconfig.app.json` file is no longer used
with the "solution" style tsconfig generated with applications. The SSR
and server schematics no longer need to modify this field since all TS
files within `src` are included by default.

Author: clydin

packages/schematics/angular/application/index.ts

@@ -33,7 +33,7 @@ import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as ApplicationOptions, Style } from './schema';
 
-function updateTsConfig(...paths: string[]) {
+function addTsProjectReference(...paths: string[]) {
   return (host: Tree) => {
     if (!host.exists('tsconfig.json')) {
       return host;
@@ -55,10 +55,10 @@ export default function (options: ApplicationOptions): Rule {
 
     return chain([
       addAppToWorkspaceFile(options, appDir, folderName),
-      updateTsConfig(
-        join(normalize(appDir), 'tsconfig.app.json'),
-        join(normalize(appDir), 'tsconfig.spec.json'),
-      ),
+      addTsProjectReference(join(normalize(appDir), 'tsconfig.app.json')),
+      options.skipTests
+        ? noop()
+        : addTsProjectReference(join(normalize(appDir), 'tsconfig.spec.json')),
       options.standalone
         ? noop()
         : schematic('module', {

packages/schematics/angular/application/index_spec.ts

@@ -110,6 +110,34 @@ describe('Application Schematic', () => {
     expect(_extends).toBe('../../tsconfig.json');
   });
 
+  it('should add project references in the root tsconfig.json', async () => {
+    const tree = await schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+
+    const { references } = readJsonFile(tree, '/tsconfig.json');
+    expect(references).toContain(
+      jasmine.objectContaining({ path: 'projects/foo/tsconfig.app.json' }),
+    );
+    expect(references).toContain(
+      jasmine.objectContaining({ path: 'projects/foo/tsconfig.spec.json' }),
+    );
+  });
+
+  it('should not add spec project reference in the root tsconfig.json with "skipTests" enabled', async () => {
+    const tree = await schematicRunner.runSchematic(
+      'application',
+      { ...defaultOptions, skipTests: true },
+      workspaceTree,
+    );
+
+    const { references } = readJsonFile(tree, '/tsconfig.json');
+    expect(references).toContain(
+      jasmine.objectContaining({ path: 'projects/foo/tsconfig.app.json' }),
+    );
+    expect(references).not.toContain(
+      jasmine.objectContaining({ path: 'projects/foo/tsconfig.spec.json' }),
+    );
+  });
+
   it('should install npm dependencies when `skipInstall` is false', async () => {
     await schematicRunner.runSchematic(
       'application',

packages/schematics/angular/server/index.ts

@@ -119,10 +119,6 @@ function updateConfigFileApplicationBuilder(options: ServerOptions): Rule {
 function updateTsConfigFile(tsConfigPath: string): Rule {
   return (host: Tree) => {
     const json = new JSONFile(host, tsConfigPath);
-    const filesPath = ['files'];
-    const files = new Set((json.get(filesPath) as string[] | undefined) ?? []);
-    files.add('src/' + serverMainEntryName);
-    json.modify(filesPath, [...files]);
 
     const typePath = ['compilerOptions', 'types'];
     const types = new Set((json.get(typePath) as string[] | undefined) ?? []);

packages/schematics/angular/server/index_spec.ts

@@ -167,7 +167,6 @@ describe('Server Schematic', () => {
       const filePath = '/projects/bar/tsconfig.app.json';
       const contents = parseJson(tree.readContent(filePath).toString());
       expect(contents.compilerOptions.types).toEqual(['node']);
-      expect(contents.files).toEqual(['src/main.ts', 'src/main.server.ts']);
     });
 
     it(`should add 'provideClientHydration' to the providers list`, async () => {

packages/schematics/angular/ssr/index.ts

@@ -154,6 +154,13 @@ function updateApplicationBuilderTsConfigRule(options: SSROptions): Rule {
     }
 
     const json = new JSONFile(host, tsConfigPath);
+
+    // Skip adding the files entry if the server entry would already be included
+    const include = json.get(['include']);
+    if (Array.isArray(include) && include.includes('src/**/*.ts')) {
+      return;
+    }
+
     const filesPath = ['files'];
     const files = new Set((json.get(filesPath) as string[] | undefined) ?? []);
     files.add('src/server.ts');

packages/schematics/angular/ssr/index_spec.ts

@@ -70,13 +70,28 @@ describe('SSR Schematic', () => {
       expect((schematicRunner.tasks[0].options as { command: string }).command).toBe('install');
     });
 
-    it(`should update 'tsconfig.app.json' files with Express main file`, async () => {
+    it(`should not update 'tsconfig.app.json' files with Express main file already included`, async () => {
       const tree = await schematicRunner.runSchematic('ssr', defaultOptions, appTree);
       const { files } = tree.readJson('/projects/test-app/tsconfig.app.json') as {
         files: string[];
       };
 
-      expect(files).toEqual(['src/main.ts', 'src/main.server.ts', 'src/server.ts']);
+      expect(files).toBeUndefined();
+    });
+
+    it(`should update 'tsconfig.app.json' files with Express main file if not included`, async () => {
+      const appTsConfigContent = appTree.readJson('/projects/test-app/tsconfig.app.json') as {
+        include?: string[];
+      };
+      appTsConfigContent.include = [];
+      appTree.overwrite('/projects/test-app/tsconfig.app.json', JSON.stringify(appTsConfigContent));
+
+      const tree = await schematicRunner.runSchematic('ssr', defaultOptions, appTree);
+      const { files } = tree.readJson('/projects/test-app/tsconfig.app.json') as {
+        files: string[];
+      };
+
+      expect(files).toContain('src/server.ts');
     });
   });
 

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

@@ -2,8 +2,7 @@
 /* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
 {
   "compileOnSave": false,
-  "compilerOptions": {
-    "outDir": "./dist/out-tsc",<% if (strict) { %>
+  "compilerOptions": {<% if (strict) { %>
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,