From 3fe48a1bcf0d5641f46ffa374f9aa1a6684975dd Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Thu, 24 Nov 2022 11:16:56 +0000
Subject: [PATCH] fix(angular): e2e test should correctly fail

---
 e2e/angular-core/src/projects.test.ts                 | 2 ++
 packages/angular/src/generators/remote/lib/add-ssr.ts | 3 +++
 packages/angular/src/generators/remote/remote.spec.ts | 2 +-
 packages/angular/src/utils/versions.ts                | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/e2e/angular-core/src/projects.test.ts b/e2e/angular-core/src/projects.test.ts
index 52747988ddcb2a..9aa049a3979a14 100644
--- a/e2e/angular-core/src/projects.test.ts
+++ b/e2e/angular-core/src/projects.test.ts
@@ -375,6 +375,7 @@ describe('Angular Projects', () => {
 
     try {
       process = await runCommandUntil(`serve-ssr ${remoteApp1}`, (output) => {
+        console.log(output);
         return (
           output.includes(`Browser application bundle generation complete.`) &&
           output.includes(`Server application bundle generation complete.`) &&
@@ -385,6 +386,7 @@ describe('Angular Projects', () => {
       });
     } catch (err) {
       console.error(err);
+      throw err;
     }
 
     // port and process cleanup
diff --git a/packages/angular/src/generators/remote/lib/add-ssr.ts b/packages/angular/src/generators/remote/lib/add-ssr.ts
index 599a4d0aef32f9..729e8a4e849669 100644
--- a/packages/angular/src/generators/remote/lib/add-ssr.ts
+++ b/packages/angular/src/generators/remote/lib/add-ssr.ts
@@ -11,6 +11,7 @@ import type { Schema } from '../schema';
 import setupSsr from '../../setup-ssr/setup-ssr';
 import {
   corsVersion,
+  expressVersion,
   moduleFederationNodeVersion,
 } from '../../../utils/versions';
 
@@ -34,6 +35,7 @@ export async function addSsr(tree: Tree, options: Schema, appName: string) {
     appName,
     tmpl: '',
   });
+  console.log('after generate files');
 
   // update project.json
   project = readProjectConfiguration(tree, appName);
@@ -49,6 +51,7 @@ export async function addSsr(tree: Tree, options: Schema, appName: string) {
     tree,
     {
       cors: corsVersion,
+      express: expressVersion,
       '@module-federation/node': moduleFederationNodeVersion,
     },
     {}
diff --git a/packages/angular/src/generators/remote/remote.spec.ts b/packages/angular/src/generators/remote/remote.spec.ts
index c638d8fc0bc26d..444b1d377b30ee 100644
--- a/packages/angular/src/generators/remote/remote.spec.ts
+++ b/packages/angular/src/generators/remote/remote.spec.ts
@@ -199,7 +199,7 @@ describe('MF Remote App Generator', () => {
   describe('--ssr', () => {
     it('should generate the correct files', async () => {
       // ARRANGE
-      const tree = createTreeWithEmptyWorkspace();
+      const tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
 
       // ACT
       await remote(tree, {
diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
index cdfa452367889e..b22a381825ce47 100644
--- a/packages/angular/src/utils/versions.ts
+++ b/packages/angular/src/utils/versions.ts
@@ -11,6 +11,7 @@ export const tsLibVersion = '^2.3.0';
 
 export const ngUniversalVersion = '~15.0.0';
 export const corsVersion = '~2.8.5';
+export const expressVersion = '~4.18.2';
 export const moduleFederationNodeVersion = '~0.9.6';
 
 export const angularEslintVersion = '~15.0.0';