feat(express-engine): add option to skip Universal schematic (#1059)

Author: CaerusKaru

modules/express-engine/schematics/install/index.spec.ts

@@ -50,4 +50,14 @@ describe('Universal Schematic', () => {
     expect(schematicRunner.tasks[0].name).toBe('node-package');
     expect((schematicRunner.tasks[0].options as {command: string}).command).toBe('install');
   });
+
+  it('should not add Universal files', () => {
+    const noUniversal = Object.assign({}, defaultOptions);
+    noUniversal.skipUniversal = true;
+
+    const tree = schematicRunner.runSchematic('ng-add', noUniversal, appTree);
+    const filePath = '/src/server.main.ts';
+    const contents = tree.readContent(filePath);
+    expect(contents).toMatch('');
+  });
 });

modules/express-engine/schematics/install/index.ts

@@ -87,6 +87,14 @@ function updateConfigFile(options: UniversalOptions): Rule {
         ]
       }
     };
+
+    // We have to check if the project config has a server target, because
+    // if the Universal step in this schematic isn't run, it can't be guaranteed
+    // to exist
+    if (!clientProject.architect.server) {
+      return;
+    }
+
     clientProject.architect.server.configurations = serverConfig;
 
     const workspacePath = getWorkspacePath(host);
@@ -118,7 +126,8 @@ export default function (options: UniversalOptions): Rule {
     ]);
 
     return chain([
-      externalSchematic('@schematics/angular', 'universal', options),
+      options.skipUniversal ?
+        noop() : externalSchematic('@schematics/angular', 'universal', options),
       updateConfigFile(options),
       mergeWith(rootSource),
       addDependenciesAndScripts(options),

modules/express-engine/schematics/install/schema.json

@@ -72,6 +72,11 @@
       "description": "Skip adding Express server file.",
       "type": "boolean",
       "default": false
+    },
+    "skipUniversal": {
+      "description": "Skip the Angular Universal schematic",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": [

modules/express-engine/schematics/install/schema.ts

@@ -59,4 +59,8 @@ export interface Schema {
    * Skip adding Express server file.
    */
   skipServer?: boolean;
+  /**
+   * Skip the Angular Universal schematic
+   */
+  skipUniversal?: boolean;
 }