Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 11:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(@schematics/angular): add export to renderModuleFactory in server main file

Browse Source 
This is to reduce the steps for users when opting-out of ivy
This commit is contained in:
Alan Agius 2019-09-05 08:17:25 +02:00 committed by Keen Yee Liau
parent 3b6260e283
commit 6292c73773
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,4 +7,4 @@ if (environment.production) {
} }
export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>'; export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>';
export { renderModule } from '@angular/platform-server'; export { renderModule, renderModuleFactory } from '@angular/platform-server';

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

@ -14,4 +14,4 @@ if (environment.production) {
} }
export { AppServerModule } from './app/app.server.module'; export { AppServerModule } from './app/app.server.module';
export { renderModuleFactory } from '@angular/platform-server'; export { renderModule, renderModuleFactory } from '@angular/platform-server';

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

@ -14,4 +14,4 @@ if (environment.production) {
} }
export { AppServerModule } from './app/app.server.module'; export { AppServerModule } from './app/app.server.module';
export { renderModule } from '@angular/platform-server'; export { renderModule, renderModuleFactory } from '@angular/platform-server';

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

@ -1,5 +1,5 @@
import { getGlobalVariable } from '../../utils/env'; import { getGlobalVariable } from '../../utils/env';
import { appendToFile, expectFileToMatch, replaceInFile } from '../../utils/fs'; import { appendToFile, expectFileToMatch } from '../../utils/fs';
import { ng, silentNpm } from '../../utils/process'; import { ng, silentNpm } from '../../utils/process';
import { updateJsonFile } from '../../utils/project'; import { updateJsonFile } from '../../utils/project';
import { readNgVersion } from '../../utils/version'; import { readNgVersion } from '../../utils/version';
@ -15,10 +15,6 @@ export default async function () {
: readNgVersion(); : readNgVersion();
}); });
if (argv['ve']) {
await replaceInFile('src/main.server.ts', /renderModule/g, 'renderModuleFactory');
}
await silentNpm('install'); await silentNpm('install');
await ng('run', 'test-project:app-shell'); await ng('run', 'test-project:app-shell');
await expectFileToMatch('dist/test-project/index.html', /app-shell works!/); await expectFileToMatch('dist/test-project/index.html', /app-shell works!/);

2
tests/legacy-cli/e2e/tests/build/build-app-shell.ts
View File

@ -72,7 +72,7 @@ export default function() {
} }
export { AppServerModule } from './app/app.server.module'; export { AppServerModule } from './app/app.server.module';
export { renderModule${veProject ? 'Factory' : ''} } from '@angular/platform-server'; export { renderModule, renderModuleFactory } from '@angular/platform-server';
`, `,
), ),
) )

5
tests/legacy-cli/e2e/tests/build/platform-server.ts
View File

@ -20,13 +20,12 @@ export default async function () {
await silentNpm('install'); await silentNpm('install');
if (veEnabled) { if (veEnabled) {
await replaceInFile('src/main.server.ts', /renderModule/g, 'renderModuleFactory');
await writeFile( await writeFile(
'./index.js', './index.js',
` require('zone.js/dist/zone-node'); ` require('zone.js/dist/zone-node');
const fs = require('fs'); const fs = require('fs');
const { AppServerModuleNgFactory, renderModuleFactory } = require('./dist/server/main'); const { AppServerModuleNgFactory, renderModuleFactory } = require('./dist/server/main');
renderModuleFactory(AppServerModuleNgFactory, { renderModuleFactory(AppServerModuleNgFactory, {
url: '/', url: '/',
document: '<app-root></app-root>' document: '<app-root></app-root>'
@ -41,7 +40,7 @@ export default async function () {
` require('zone.js/dist/zone-node'); ` require('zone.js/dist/zone-node');
const fs = require('fs'); const fs = require('fs');
const { AppServerModule, renderModule } = require('./dist/server/main'); const { AppServerModule, renderModule } = require('./dist/server/main');
renderModule(AppServerModule, { renderModule(AppServerModule, {
url: '/', url: '/',
document: '<app-root></app-root>' document: '<app-root></app-root>'