fix(@schematics/angular): Update CLI schematic should convert server apps

fixes angular#659

Author: Brocco

packages/schematics/angular/migrations/update-6/index.ts

@@ -28,6 +28,9 @@ const defaults = {
   karma: 'karma.conf.js',
   protractor: 'protractor.conf.js',
   testTsConfig: 'tsconfig.spec.json',
+  serverOutDir: 'dist-server',
+  serverMain: 'main.server.ts',
+  serverTsConfig: 'tsconfig.server.json',
 };
 
 function getConfigPath(tree: Tree): Path {
@@ -195,8 +198,11 @@ function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
 
   const apps = config.apps || [];
   // convert the apps to projects
-  const projectMap = apps
-    .map((app: AppConfig, idx: number) => {
+  const browserApps = apps.filter(app => app.platform !== 'server');
+  const serverApps = apps.filter(app => app.platform === 'server');
+
+  const projectMap = browserApps
+    .map((app, idx) => {
       const defaultAppName = idx === 0 ? defaultAppNamePrefix : `${defaultAppNamePrefix}${idx}`;
       const name = app.name || defaultAppName;
       const outDir = app.outDir || defaults.outDir;
@@ -440,6 +446,22 @@ function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
           options: lintOptions,
         };
 
+      // server target
+      const serverApp = serverApps
+        .filter(serverApp => app.root === serverApp.root && app.index === serverApp.index)[0];
+
+      if (serverApp) {
+        const serverOptions: JsonObject = {
+          outputPath: serverApp.outDir || defaults.serverOutDir,
+          main: serverApp.main || defaults.serverMain,
+          tsConfig: serverApp.tsconfig || defaults.serverTsConfig,
+        };
+        const serverTarget: JsonObject = {
+          builder: '@angular-devkit/build-angular:server',
+          options: serverOptions,
+        };
+        architect.server = serverTarget;
+      }
       const e2eProject: JsonObject = {
         root: project.root,
         projectType: 'application',

packages/schematics/angular/migrations/update-6/index_spec.ts

@@ -107,6 +107,11 @@ describe('Migration to v6', () => {
     tree.create('/src/favicon.ico', '');
   });
 
+  // tslint:disable-next-line:no-any
+  function getConfig(tree: UnitTestTree): any {
+    return JSON.parse(tree.readContent(configPath));
+  }
+
   describe('file creation/deletion', () => {
     it('should delete the old config file', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
@@ -123,11 +128,6 @@ describe('Migration to v6', () => {
   });
 
   describe('config file contents', () => {
-    // tslint:disable-next-line:no-any
-    function getConfig(tree: UnitTestTree): any {
-      return JSON.parse(tree.readContent(configPath));
-    }
-
     it('should set root values', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
       tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
@@ -720,4 +720,55 @@ describe('Migration to v6', () => {
       expect(blacklist).toEqual([]);
     });
   });
+
+  describe('server/universal apps', () => {
+    let serverApp;
+    beforeEach(() => {
+      serverApp = {
+        platform: 'server',
+        root: 'src',
+        outDir: 'dist/server',
+        assets: [
+          'assets',
+          'favicon.ico',
+        ],
+        index: 'index.html',
+        main: 'main.server.ts',
+        test: 'test.ts',
+        tsconfig: 'tsconfig.server.json',
+        testTsconfig: 'tsconfig.spec.json',
+        prefix: 'app',
+        styles: [
+          'styles.css',
+        ],
+        scripts: [],
+        environmentSource: 'environments/environment.ts',
+        environments: {
+          dev: 'environments/environment.ts',
+          prod: 'environments/environment.prod.ts',
+        },
+      };
+      baseConfig.apps.push(serverApp);
+    });
+
+    it('should not create a separate app for server apps', () => {
+      tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
+      tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
+      const config = getConfig(tree);
+      const appCount = Object.keys(config.projects).length;
+      expect(appCount).toEqual(2);
+    });
+
+    it('should create a server target', () => {
+      tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
+      tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
+      const config = getConfig(tree);
+      const target = config.projects.foo.architect.server;
+      expect(target).toBeDefined();
+      expect(target.builder).toEqual('@angular-devkit/build-angular:server');
+      expect(target.options.outputPath).toEqual('dist/server');
+      expect(target.options.main).toEqual('main.server.ts');
+      expect(target.options.tsConfig).toEqual('tsconfig.server.json');
+    });
+  });
 });