From e58226ee948ea88f27a81d50d71945b5c9c39ee3 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 7 Oct 2021 15:30:09 +0200 Subject: [PATCH] fix(@schematics/angular): don't export `renderModuleFactory` from server file Using `renderModuleFactory` is no longer needed since this was used for ViewEngine. (cherry picked from commit 94c00afbf31704772a05a47a26036265d1335b40) --- .../test/hello-world-app/src/main.server.ts | 2 +- .../files/src/__main@stripTsExtension__.ts.template | 2 +- tests/legacy-cli/e2e/tests/build/build-app-shell.ts | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts index 385a12d1a665..97e03b7b47fb 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts +++ b/packages/angular_devkit/build_angular/test/hello-world-app/src/main.server.ts @@ -16,4 +16,4 @@ if (environment.production) { } export { AppServerModule } from './app/app.server.module'; -export { renderModule, renderModuleFactory } from '@angular/platform-server'; +export { renderModule } from '@angular/platform-server'; diff --git a/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template b/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template index 0a7e46d4d2fe..53e6ea3bb6e7 100644 --- a/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template +++ b/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template @@ -21,4 +21,4 @@ if (environment.production) { } export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>'; -export { renderModule, renderModuleFactory } from '@angular/platform-server'; +export { renderModule } from '@angular/platform-server'; diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts index 42d1a41bbd94..5c13f7a27a3e 100644 --- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts +++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts @@ -6,17 +6,18 @@ import { ng } from '../../utils/process'; import { updateJsonFile } from '../../utils/project'; import { readNgVersion } from '../../utils/version'; -export default function() { +export default function () { let platformServerVersion = readNgVersion(); if (getGlobalVariable('argv')['ng-snapshots']) { - platformServerVersion = require('../../ng-snapshot/package.json') - .dependencies['@angular/platform-server']; + platformServerVersion = require('../../ng-snapshot/package.json').dependencies[ + '@angular/platform-server' + ]; } return Promise.resolve() .then(() => - updateJsonFile('angular.json', workspaceJson => { + updateJsonFile('angular.json', (workspaceJson) => { const appArchitect = workspaceJson.projects['test-project'].architect; appArchitect['server'] = { builder: '@angular-devkit/build-angular:server', @@ -74,7 +75,7 @@ export default function() { } export { AppServerModule } from './app/app.server.module'; - export { renderModule, renderModuleFactory } from '@angular/platform-server'; + export { renderModule } from '@angular/platform-server'; `, ), ) @@ -157,7 +158,7 @@ export default function() { ), ) .then(() => - updateJsonFile('package.json', packageJson => { + updateJsonFile('package.json', (packageJson) => { const dependencies = packageJson['dependencies']; dependencies['@angular/platform-server'] = platformServerVersion; }).then(() => installWorkspacePackages()),