test: update nguniversal test for version 9

Author: alan-agius4

tests/legacy-cli/e2e/tests/build/platform-server.ts

@@ -1,6 +1,6 @@
 import { normalize } from 'path';
 import { getGlobalVariable } from '../../utils/env';
-import { expectFileToMatch, writeFile } from '../../utils/fs';
+import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
 import { exec, ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
@@ -9,9 +9,7 @@ export default async function () {
   const argv = getGlobalVariable('argv');
   const veEnabled = argv['ve'];
 
-  await ng('add', '@nguniversal/express-engine', '--client-project', 'test-project');
-  // todo remove once https://github.com/angular/universal/pull/1229 is landed
-  await silentNpm('install', '@types/express', '--save-dev');
+  await ng('add', '@nguniversal/[email protected]');
 
   await updateJsonFile('package.json', packageJson => {
     const dependencies = packageJson['dependencies'];
@@ -22,32 +20,40 @@ export default async function () {
 
   await silentNpm('install');
   if (veEnabled) {
+    // todo: https://github.com/angular/angular-cli/issues/15851
+    // We need to fix the 'export_ngfactory' transformer as with the
+    // new universal approach the factory is not exported.
+    await appendToFile(
+      './src/main.server.ts',
+      `export { AppServerModuleNgFactory } from './app/app.server.module.ngfactory'`,
+    );
+
     await writeFile(
-      './index.js',
-      ` require('zone.js/dist/zone-node');
-        const fs = require('fs');
-        const { AppServerModuleNgFactory, renderModuleFactory } = require('./dist/server/main');
+      './server.ts',
+      ` import 'zone.js/dist/zone-node';
+        import * as fs from 'fs';
+        import { AppServerModuleNgFactory, renderModuleFactory } from './src/main.server';
 
         renderModuleFactory(AppServerModuleNgFactory, {
           url: '/',
           document: '<app-root></app-root>'
         }).then(html => {
-          fs.writeFileSync('dist/server/index.html', html);
+          fs.writeFileSync('dist/test-project/server/index.html', html);
         });
         `,
     );
   } else {
     await writeFile(
-      './index.js',
-      ` require('zone.js/dist/zone-node');
-        const fs = require('fs');
-        const { AppServerModule, renderModule } = require('./dist/server/main');
+      './server.ts',
+      ` import 'zone.js/dist/zone-node';
+        import * as fs from 'fs';
+        import { AppServerModule, renderModule } from './src/main.server';
 
         renderModule(AppServerModule, {
           url: '/',
           document: '<app-root></app-root>'
         }).then(html => {
-          fs.writeFileSync('dist/server/index.html', html);
+          fs.writeFileSync('dist/test-project/server/index.html', html);
         });
         `,
     );
@@ -56,18 +62,18 @@ export default async function () {
 
   await ng('run', 'test-project:server:production', '--optimization', 'false');
 
-  await expectFileToMatch('dist/server/main.js', veEnabled ? /exports.*AppServerModuleNgFactory/ : /exports.*AppServerModule/);
-  await exec(normalize('node'), 'index.js');
+  await expectFileToMatch('dist/test-project/server/main.js', veEnabled ? /exports.*AppServerModuleNgFactory/ : /exports.*AppServerModule/);
+  await exec(normalize('node'), 'dist/test-project/server/main.js');
   await expectFileToMatch(
-    'dist/server/index.html',
+    'dist/test-project/server/index.html',
     /<p.*>Here are some links to help you get started:<\/p>/,
   );
 
   // works with optimization and bundleDependencies enabled
   await ng('run', 'test-project:server:production', '--optimization', '--bundleDependencies', 'all');
-  await exec(normalize('node'), 'index.js');
+  await exec(normalize('node'), 'dist/test-project/server/main.js');
   await expectFileToMatch(
-    'dist/server/index.html',
+    'dist/test-project/server/index.html',
     /<p.*>Here are some links to help you get started:<\/p>/,
   );
 }