Skip to content

Commit 3623505

Browse files
leosvelperezFrozenPandaz
authored andcommitted
fix(angular): generate app server module setup correctly in setup-ssr generator (#21702)
(cherry picked from commit ab9c579)
1 parent 8464b64 commit 3623505

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

packages/angular/src/generators/host/__snapshots__/host.spec.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ platformBrowserDynamic()
102102
`;
103103
104104
exports[`Host App Generator --ssr should generate the correct files 3`] = `
105-
"export { AppServerModule } from './app/app.server.module';
105+
"export { AppServerModule as default } from './app/app.server.module';
106106
"
107107
`;
108108
@@ -722,7 +722,7 @@ platformBrowserDynamic()
722722
`;
723723
724724
exports[`Host App Generator --ssr should generate the correct files when --typescript=true 3`] = `
725-
"export { AppServerModule } from './app/app.server.module';
725+
"export { AppServerModule as default } from './app/app.server.module';
726726
"
727727
`;
728728

packages/angular/src/generators/remote/__snapshots__/remote.spec.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ platformBrowserDynamic()
117117
`;
118118
119119
exports[`MF Remote App Generator --ssr should generate the correct files 3`] = `
120-
"export { AppServerModule } from './app/app.server.module';
120+
"export { AppServerModule as default } from './app/app.server.module';
121121
"
122122
`;
123123
@@ -339,7 +339,7 @@ platformBrowserDynamic()
339339
`;
340340
341341
exports[`MF Remote App Generator --ssr should generate the correct files when --typescriptConfiguration=true 3`] = `
342-
"export { AppServerModule } from './app/app.server.module';
342+
"export { AppServerModule as default } from './app/app.server.module';
343343
"
344344
`;
345345

packages/angular/src/generators/setup-ssr/__snapshots__/setup-ssr.spec.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ngExpressEngine } from '@nguniversal/express-engine';
88
import * as express from 'express';
99
import { existsSync } from 'fs';
1010
import { join } from 'path';
11-
import { AppServerModule } from './src/main.server';
11+
import AppServerModule from './src/main.server';
1212
1313
// The Express app is exported so that it can be used by serverless Functions.
1414
export function app(): express.Express {
@@ -123,7 +123,7 @@ import { CommonEngine } from '@angular/ssr';
123123
import express from 'express';
124124
import { fileURLToPath } from 'node:url';
125125
import { dirname, join, resolve } from 'node:path';
126-
import { AppServerModule } from './src/main.server';
126+
import AppServerModule from './src/main.server';
127127
128128
// The Express app is exported so that it can be used by serverless Functions.
129129
export function app(): express.Express {
@@ -332,7 +332,7 @@ import { CommonEngine } from '@angular/ssr';
332332
import * as express from 'express';
333333
import { existsSync } from 'node:fs';
334334
import { join } from 'node:path';
335-
import { AppServerModule } from './src/main.server';
335+
import AppServerModule from './src/main.server';
336336
337337
// The Express app is exported so that it can be used by serverless Functions.
338338
export function app(): express.Express {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>';
1+
export { <%= rootModuleClassName %> as default } from './app/<%= rootModuleFileName.slice(0, -3) %>';

packages/angular/src/generators/setup-ssr/files/server/application-builder/__serverFileName__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CommonEngine } from '@angular/ssr';
33
import express from 'express';
44
import { fileURLToPath } from 'node:url';
55
import { dirname, join, resolve } from 'node:path';
6-
import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
6+
import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
77

88
// The Express app is exported so that it can be used by serverless Functions.
99
export function app(): express.Express {

packages/angular/src/generators/setup-ssr/files/server/server-builder/pre-v17/__serverFileName__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ngExpressEngine } from '@nguniversal/express-engine';
55
import * as express from 'express';
66
import { existsSync } from 'fs';
77
import { join } from 'path';
8-
import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
8+
import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
99

1010
// The Express app is exported so that it can be used by serverless Functions.
1111
export function app(): express.Express {

packages/angular/src/generators/setup-ssr/files/server/server-builder/v17+/__serverFileName__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { CommonEngine } from '@angular/ssr';
55
import * as express from 'express';
66
import { existsSync } from 'node:fs';
77
import { join } from 'node:path';
8-
import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %> }<% } %> from './src/<%= main.slice(0, -3) %>';
8+
import <% if (standalone) { %>bootstrap<% } else { %><%= rootModuleClassName %><% } %> from './src/<%= main.slice(0, -3) %>';
99

1010
// The Express app is exported so that it can be used by serverless Functions.
1111
export function app(): express.Express {

packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('setupSSR', () => {
3838
expect(tree.read('app1/server.ts', 'utf-8')).toMatchSnapshot();
3939
expect(tree.read('app1/src/main.server.ts', 'utf-8'))
4040
.toMatchInlineSnapshot(`
41-
"export { AppServerModule } from './app/app.server.module';
41+
"export { AppServerModule as default } from './app/app.server.module';
4242
"
4343
`);
4444
expect(tree.read('app1/src/main.ts', 'utf-8')).toMatchInlineSnapshot(`
@@ -204,7 +204,7 @@ describe('setupSSR', () => {
204204
expect(tree.read('app1/server.ts', 'utf-8')).toMatchSnapshot();
205205
expect(tree.read('app1/src/main.server.ts', 'utf-8'))
206206
.toMatchInlineSnapshot(`
207-
"export { AppServerModule } from './app/app.server.module';
207+
"export { AppServerModule as default } from './app/app.server.module';
208208
"
209209
`);
210210
expect(tree.read('app1/src/main.ts', 'utf-8')).toMatchInlineSnapshot(`

0 commit comments

Comments
 (0)