fix(common): don't run universal schematic if server target already e… (#1241)

Author: alan-agius4

integration/express-engine-ivy/angular.json

@@ -134,6 +134,7 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
+            "webdriverUpdate": false,
             "protractorConfig": "e2e/protractor.conf.js"
           }
         },

integration/express-engine-ve/angular.json

@@ -134,6 +134,7 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
+            "webdriverUpdate": false,
             "protractorConfig": "e2e/protractor.conf.js"
           }
         },

integration/hapi-engine-ivy/angular.json

@@ -134,6 +134,7 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
+            "webdriverUpdate": false,
             "protractorConfig": "e2e/protractor.conf.js"
           }
         },

integration/hapi-engine-ve/angular.json

@@ -134,6 +134,7 @@
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
+            "webdriverUpdate": false,
             "protractorConfig": "e2e/protractor.conf.js"
           }
         },

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

@@ -52,4 +52,20 @@ describe('Universal Schematic', () => {
       'server.ts',
     ]);
   });
+
+  it(`should work when server target already exists`, async () => {
+    let tree = await schematicRunner
+      .runExternalSchematicAsync('@schematics/angular', 'universal', defaultOptions, appTree)
+      .toPromise();
+
+    tree = await schematicRunner
+      .runSchematicAsync('install', defaultOptions, tree)
+      .toPromise();
+
+    const contents = JSON.parse(tree.readContent('/projects/bar/tsconfig.server.json'));
+    expect(contents.files).toEqual([
+      'src/main.server.ts',
+      'server.ts',
+    ]);
+  });
 });

modules/common/schematics/install/index.ts

@@ -10,6 +10,7 @@ import {
   externalSchematic,
   Rule,
   SchematicsException,
+  noop,
 } from '@angular-devkit/schematics';
 import {normalize, join, parseJsonAst, JsonParseMode} from '@angular-devkit/core';
 import {updateWorkspace} from '@schematics/angular/utility/workspace';
@@ -120,9 +121,13 @@ function updateServerTsConfigRule(options: UniversalOptions): Rule {
 }
 
 export default function (options: UniversalOptions): Rule {
-  return () => {
+  return async host => {
+    const clientProject = await getClientProject(host, options.clientProject);
+
     return chain([
-      externalSchematic('@schematics/angular', 'universal', options),
+      clientProject.targets.has('server')
+        ? noop()
+        : externalSchematic('@schematics/angular', 'universal', options),
       addScriptsRule(options),
       updateServerTsConfigRule(options),
       updateConfigFileRule(options),