fix(common): update server main option when using ng add/ng update

The server target main option needs to be updated when running the add schematic to point to the server.ts entrypoint

Author: alan-agius4

modules/common/schematics/add/index.spec.ts

@@ -34,6 +34,7 @@ describe('Add Schematic Rule', () => {
     expect(architect.build.configurations.production).toBeDefined();
     expect(architect.build.options.outputPath).toBe('dist/test-app/browser');
     expect(architect.server.options.outputPath).toBe('dist/test-app/server');
+    expect(architect.server.options.main).toBe('projects/test-app/server.ts');
 
     const productionConfig = architect.server.configurations.production;
     expect(productionConfig.fileReplacements).toBeDefined();

modules/common/schematics/add/index.ts

@@ -12,13 +12,14 @@ import {
   SchematicsException,
   noop,
 } from '@angular-devkit/schematics';
-import {parseJsonAst, JsonParseMode} from '@angular-devkit/core';
+import {parseJsonAst, JsonParseMode, normalize, join} from '@angular-devkit/core';
 import {
   findPropertyInAstObject,
   appendValueInAstArray,
 } from '@schematics/angular/utility/json-utils';
 import {Schema as UniversalOptions} from '@schematics/angular/universal/schema';
 import {stripTsExtension, getOutputPath, getProject} from '../utils';
+import {updateWorkspace} from '@schematics/angular/utility/workspace';
 
 export interface AddUniversalOptions extends UniversalOptions {
   serverFileName?: string;
@@ -34,6 +35,7 @@ export function addUniversalCommonRule(options: AddUniversalOptions): Rule {
         : externalSchematic('@schematics/angular', 'universal', options),
       addScriptsRule(options),
       updateServerTsConfigRule(options),
+      updateWorkspaceConfigRule(options),
     ]);
   };
 }
@@ -58,6 +60,23 @@ function addScriptsRule(options: AddUniversalOptions): Rule {
   };
 }
 
+function updateWorkspaceConfigRule(options: AddUniversalOptions): Rule {
+  return () => {
+    return updateWorkspace(workspace => {
+      const project = workspace.projects.get(options.clientProject);
+      if (!project) {
+        return;
+      }
+
+      const serverTarget = project.targets.get('server');
+      serverTarget.options.main = join(
+        normalize(project.root),
+        stripTsExtension(options.serverFileName) + '.ts',
+      );
+    });
+  };
+}
+
 function updateServerTsConfigRule(options: AddUniversalOptions): Rule {
   return async host => {
     const clientProject = await getProject(host, options.clientProject);
@@ -102,17 +121,3 @@ function updateServerTsConfigRule(options: AddUniversalOptions): Rule {
     }
   };
 }
-
-export default function (options: UniversalOptions): Rule {
-  return async host => {
-    const clientProject = await getProject(host, options.clientProject);
-
-    return chain([
-      clientProject.targets.has('server')
-        ? noop()
-        : externalSchematic('@schematics/angular', 'universal', options),
-      addScriptsRule(options),
-      updateServerTsConfigRule(options),
-    ]);
-  };
-}