Skip to content

Commit 7c0166f

Browse files
MarkPieszakOceansideBill
authored andcommitted
feat(Angular 5.0): update engine-etc for angular 5.0 & Domino (TrilonIO#437)
* feat(5.0): update engine-etc for angular 5.0-rc1 WIP - More updates to come * remove ng 4 references * update source maps for faster HMR builds * use aspnetcore-engine & misc updates and fixes * update to 5.0 official Closes TrilonIO#434 Closes TrilonIO#435 Closes TrilonIO#430 Closes TrilonIO#424
1 parent 0360ad5 commit 7c0166f

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

ClientApp/app/app.module.ts

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ export function createTranslateLoader(http: HttpClient, baseHref) {
5454
HttpClientModule,
5555
TransferHttpCacheModule,
5656
BrowserTransferStateModule,
57+
<<<<<<< HEAD
5758

5859

5960
FormsModule,

ClientApp/boot.server.ts

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ enableProdMode();
1111

1212
export default createServerRenderer((params) => {
1313

14+
console.log('server ?');
15+
1416
// Platform-server provider configuration
1517
const setupOptions: IEngineOptions = {
1618
appSelector: '<app-root></app-root>',

0 commit comments

Comments
 (0)