Skip to content

Commit 6292c73

Browse files
alan-agius4Keen Yee Liau
authored andcommitted
feat(@schematics/angular): add export to renderModuleFactory in server main file
This is to reduce the steps for users when opting-out of ivy
1 parent 3b6260e commit 6292c73

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ if (environment.production) {
77
}
88

99
export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>';
10-
export { renderModule } from '@angular/platform-server';
10+
export { renderModule, renderModuleFactory } from '@angular/platform-server';

tests/angular_devkit/build_angular/hello-world-app-ve/src/main.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ if (environment.production) {
1414
}
1515

1616
export { AppServerModule } from './app/app.server.module';
17-
export { renderModuleFactory } from '@angular/platform-server';
17+
export { renderModule, renderModuleFactory } from '@angular/platform-server';

tests/angular_devkit/build_angular/hello-world-app/src/main.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ if (environment.production) {
1414
}
1515

1616
export { AppServerModule } from './app/app.server.module';
17-
export { renderModule } from '@angular/platform-server';
17+
export { renderModule, renderModuleFactory } from '@angular/platform-server';

tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getGlobalVariable } from '../../utils/env';
2-
import { appendToFile, expectFileToMatch, replaceInFile } from '../../utils/fs';
2+
import { appendToFile, expectFileToMatch } from '../../utils/fs';
33
import { ng, silentNpm } from '../../utils/process';
44
import { updateJsonFile } from '../../utils/project';
55
import { readNgVersion } from '../../utils/version';
@@ -15,10 +15,6 @@ export default async function () {
1515
: readNgVersion();
1616
});
1717

18-
if (argv['ve']) {
19-
await replaceInFile('src/main.server.ts', /renderModule/g, 'renderModuleFactory');
20-
}
21-
2218
await silentNpm('install');
2319
await ng('run', 'test-project:app-shell');
2420
await expectFileToMatch('dist/test-project/index.html', /app-shell works!/);

tests/legacy-cli/e2e/tests/build/build-app-shell.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default function() {
7272
}
7373
7474
export { AppServerModule } from './app/app.server.module';
75-
export { renderModule${veProject ? 'Factory' : ''} } from '@angular/platform-server';
75+
export { renderModule, renderModuleFactory } from '@angular/platform-server';
7676
`,
7777
),
7878
)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ export default async function () {
2020

2121
await silentNpm('install');
2222
if (veEnabled) {
23-
await replaceInFile('src/main.server.ts', /renderModule/g, 'renderModuleFactory');
2423
await writeFile(
2524
'./index.js',
2625
` require('zone.js/dist/zone-node');
2726
const fs = require('fs');
2827
const { AppServerModuleNgFactory, renderModuleFactory } = require('./dist/server/main');
29-
28+
3029
renderModuleFactory(AppServerModuleNgFactory, {
3130
url: '/',
3231
document: '<app-root></app-root>'
@@ -41,7 +40,7 @@ export default async function () {
4140
` require('zone.js/dist/zone-node');
4241
const fs = require('fs');
4342
const { AppServerModule, renderModule } = require('./dist/server/main');
44-
43+
4544
renderModule(AppServerModule, {
4645
url: '/',
4746
document: '<app-root></app-root>'

0 commit comments

Comments
 (0)