refactor(@schematics/angular): update templates to use express version 5

Author: alan-agius4

package.json

@@ -73,7 +73,7 @@
     "@types/babel__core": "7.20.5",
     "@types/babel__generator": "^7.6.8",
     "@types/browser-sync": "^2.27.0",
-    "@types/express": "^4.16.0",
+    "@types/express": "~5.0.1",
     "@types/http-proxy": "^1.17.4",
     "@types/ini": "^4.0.0",
     "@types/jasmine": "~5.1.0",
@@ -106,7 +106,7 @@
     "eslint-config-prettier": "10.1.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.31.0",
-    "express": "4.21.2",
+    "express": "5.1.0",
     "fast-glob": "3.3.3",
     "globals": "16.0.0",
     "http-proxy": "^1.18.1",

packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts

@@ -39,11 +39,12 @@ describe('Serve SSR Builder', () => {
           server.set('view engine', 'html');
           server.set('views', distFolder);
 
-          server.get('*.*', express.static(distFolder, {
-            maxAge: '1y'
+          server.use(express.static(distFolder, {
+            maxAge: '1y',
+            index: false,
           }));
 
-          server.get('*', (req, res, next) => {
+          server.use((req, res, next) => {
             commonEngine
               .render({
                 bootstrap: AppServerModule,

packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts

@@ -39,11 +39,12 @@ describe('Serve SSR Builder', () => {
           server.set('view engine', 'html');
           server.set('views', distFolder);
 
-          server.get('*.*', express.static(distFolder, {
-            maxAge: '1y'
+          server.use(express.static(distFolder, {
+            maxAge: '1y',
+            index: false,
           }));
 
-          server.get('*', (req, res, next) => {
+          server.use((req, res, next) => {
             commonEngine
               .render({
                 bootstrap: AppServerModule,

packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts

@@ -38,11 +38,12 @@ describe('Serve SSR Builder', () => {
         server.set('view engine', 'html');
         server.set('views', distFolder);
 
-        server.get('*.*', express.static(distFolder, {
-          maxAge: '1y'
+        server.use(express.static(distFolder, {
+          maxAge: '1y',
+          index: false,
         }));
 
-        server.get('*', (req, res, next) => {
+        server.use((req, res, next) => {
           commonEngine
             .render({
               bootstrap: AppServerModule,

packages/schematics/angular/migrations/use-application-builder/migration.ts

@@ -158,7 +158,6 @@ function* updateBuildTarget(
 
     yield externalSchematic('@schematics/angular', 'ssr', {
       project: projectName,
-      skipInstall: true,
     });
   }
 }

packages/schematics/angular/ssr/files/application-builder/server.ts.template

@@ -18,7 +18,7 @@ const angularApp = new AngularNodeAppEngine();
  *
  * Example:
  * ```ts
- * app.get('/api/**', (req, res) => {
+ * app.get('/api/{*splat}', (req, res) => {
  *   // Handle API request
  * });
  * ```
@@ -38,7 +38,7 @@ app.use(
 /**
  * Handle all other requests by rendering the Angular application.
  */
-app.use('/**', (req, res, next) => {
+app.use((req, res, next) => {
   angularApp
     .handle(req)
     .then((response) =>
@@ -53,7 +53,11 @@ app.use('/**', (req, res, next) => {
  */
 if (isMainModule(import.meta.url)) {
   const port = process.env['PORT'] || 4000;
-  app.listen(port, () => {
+  app.listen(port, (error) => {
+    if (error) {
+      throw error;
+    }
+
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }

packages/schematics/angular/ssr/files/server-builder/server.ts.template

@@ -21,14 +21,15 @@ export function app(): express.Express {
   server.set('views', distFolder);
 
   // Example Express Rest API endpoints
-  // server.get('/api/**', (req, res) => { });
+  // server.get('/api/{*splat}', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(distFolder, {
-    maxAge: '1y'
+  server.use(express.static(distFolder, {
+    maxAge: '1y',
+    index: false,
   }));
 
   // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
+  server.use((req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
 
     commonEngine
@@ -51,7 +52,11 @@ function run(): void {
 
   // Start up the Node server
   const server = app();
-  server.listen(port, () => {
+  server.listen(port, (error) => {
+    if (error) {
+      throw error;
+    }
+
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }

packages/schematics/angular/ssr/index.ts

@@ -24,6 +24,7 @@ import { posix } from 'node:path';
 import { Schema as ServerOptions } from '../server/schema';
 import {
   DependencyType,
+  ExistingBehavior,
   InstallBehavior,
   addDependency,
   readWorkspace,
@@ -299,10 +300,12 @@ function addDependencies({ skipInstall }: SSROptions, isUsingApplicationBuilder:
     addDependency('express', latestVersions['express'], {
       type: DependencyType.Default,
       install,
+      existing: ExistingBehavior.Replace,
     }),
     addDependency('@types/express', latestVersions['@types/express'], {
       type: DependencyType.Dev,
       install,
+      existing: ExistingBehavior.Replace,
     }),
   ];
 

packages/schematics/angular/utility/latest-versions/package.json

@@ -3,11 +3,11 @@
   "comment": "This file is needed so that dependencies are synced by Renovate.",
   "private": true,
   "dependencies": {
-    "@types/express": "^4.17.17",
+    "@types/express": "^5.0.1",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^20.17.19",
     "browser-sync": "^3.0.0",
-    "express": "^4.18.2",
+    "express": "^5.1.0",
     "jasmine-core": "~5.6.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.2.0",