Upgrade to Angular 16

jhades · jhades · commit 3324e58e9040 · 2023-05-10T15:21:52.000+02:00
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 This repository contains the code of the course [Angular Universal In Depth](https://angular-university.io/course/angular-universal-course).
 
-This course repository is updated to Angular v15.
+This course repository is updated to Angular v16.
 
 ![Angular Universal In Depth](https://angular-university.s3-us-west-1.amazonaws.com/course-images/angular-universal-course.jpg)
 
diff --git a/angular.json b/angular.json
@@ -121,7 +121,8 @@
             "main": "server.ts",
             "tsConfig": "tsconfig.server.json",
             "sourceMap": true,
-            "optimization": false
+            "optimization": false,
+            "buildOptimizer": false
           },
           "configurations": {
             "production": {
@@ -133,7 +134,8 @@
                 }
               ],
               "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
             }
           }
         },
diff --git a/server.ts b/server.ts
@@ -1,22 +1,21 @@
 import 'zone.js/node';
 
+import { APP_BASE_HREF } from '@angular/common';
 import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
-import { join } from 'path';
-
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { AppServerModule } from './src/main.server';
-import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
   const distFolder = join(process.cwd(), 'dist/angular-universal-course/browser');
   const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
 
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
   server.engine('html', ngExpressEngine({
-    bootstrap: AppServerModule,
+    bootstrap: AppServerModule
   }));
 
   server.set('view engine', 'html');
@@ -38,7 +37,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env.PORT || 4000;
+  const port = process.env['PORT'] || 4000;
 
   // Start up the Node server
   const server = app();
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
+import {BrowserModule} from '@angular/platform-browser';
 import {NgModule} from '@angular/core';
 
 import {AppRoutingModule} from './app-routing.module';
@@ -49,7 +49,7 @@ import {AppShellNoRenderDirective} from "./directives/app-shell-norender.directi
   ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'serverApp' }),
-    BrowserTransferStateModule,
+    //BrowserTransferStateModule,
     BrowserAnimationsModule,
     MatMenuModule,
     MatButtonModule,
diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
+import {ServerModule} from '@angular/platform-server';
 
 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@@ -8,7 +8,6 @@ import { AppComponent } from './app.component';
   imports: [
     AppModule,
     ServerModule,
-    ServerTransferStateModule
   ],
   bootstrap: [AppComponent],
 })
diff --git a/src/main.server.ts b/src/main.server.ts
@@ -1,10 +1,2 @@
-import { enableProdMode } from '@angular/core';
-
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
 
 export { AppServerModule } from './app/app.server.module';
-export { renderModuleFactory } from '@angular/platform-server';
diff --git a/tsconfig.server.json b/tsconfig.server.json
@@ -10,8 +10,5 @@
   "files": [
     "src/main.server.ts",
     "server.ts"
-  ],
-  "angularCompilerOptions": {
-    "entryModule": "./src/app/app.server.module#AppServerModule"
-  }
+  ]
 }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,8 @@`
`121`	`121`	`"main": "server.ts",`
`122`	`122`	`"tsConfig": "tsconfig.server.json",`
`123`	`123`	`"sourceMap": true,`
`124`		`- "optimization": false`
	`124`	`+ "optimization": false,`
	`125`	`+ "buildOptimizer": false`
`125`	`126`	`},`
`126`	`127`	`"configurations": {`
`127`	`128`	`"production": {`
`@@ -133,7 +134,8 @@`
`133`	`134`	`}`
`134`	`135`	`],`
`135`	`136`	`"sourceMap": false,`
`136`		`- "optimization": true`
	`137`	`+ "optimization": true,`
	`138`	`+ "buildOptimizer": true`
`137`	`139`	`}`
`138`	`140`	`}`
`139`	`141`	`},`