[angular-18] app.module: replace provider withFetch with withInterceptorsFromDi

README.md

@@ -1,6 +1,6 @@
 # Aggregator
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 18.1.0.
 
 ## Install packages
 

angular.json

@@ -203,18 +203,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "aggregator:build"
+            "buildTarget": "aggregator:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "aggregator:build:production"
+              "buildTarget": "aggregator:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "aggregator:build"
+            "buildTarget": "aggregator:build"
           }
         },
         "test": {
@@ -287,7 +287,7 @@
           "defaultConfiguration": ""
         },
         "serve-ssr": {
-          "builder": "@nguniversal/builders:ssr-dev-server",
+          "builder": "@angular-devkit/build-angular:ssr-dev-server",
           "options": {
             "browserTarget": "aggregator:build",
             "serverTarget": "aggregator:server"
@@ -300,7 +300,7 @@
           }
         },
         "prerender": {
-          "builder": "@nguniversal/builders:prerender",
+          "builder": "@angular-devkit/build-angular:prerender",
           "options": {
             "browserTarget": "aggregator:build:production",
             "serverTarget": "aggregator:server:production",

package.json

@@ -21,42 +21,42 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.8",
+    "@angular/animations": "^18.1.0",
-    "@angular/cdk": "^16.1.7",
+    "@angular/cdk": "^18.1.0",
-    "@angular/common": "^16.1.8",
+    "@angular/common": "^18.1.0",
-    "@angular/compiler": "^16.1.8",
+    "@angular/compiler": "^18.1.0",
-    "@angular/core": "^16.1.8",
+    "@angular/core": "^18.1.0",
-    "@angular/forms": "^16.1.8",
+    "@angular/forms": "^18.1.0",
-    "@angular/localize": "^16.1.8",
+    "@angular/localize": "^18.1.0",
-    "@angular/material": "^16.1.7",
+    "@angular/material": "^18.1.0",
-    "@angular/platform-browser": "^16.1.8",
+    "@angular/platform-browser": "^18.1.0",
-    "@angular/platform-browser-dynamic": "^16.1.8",
+    "@angular/platform-browser-dynamic": "^18.1.0",
-    "@angular/platform-server": "^16.1.8",
+    "@angular/platform-server": "^18.1.0",
-    "@angular/router": "^16.1.8",
+    "@angular/router": "^18.1.0",
-    "@nguniversal/express-engine": "^16.1.1",
+    "@angular/ssr": "^18.1.0",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
     "jquery": "^3.4.1",
-    "ng-recaptcha": "^12.0.2",
+    "ng-recaptcha-2": "^14.0.0",
     "prom-client": "^11.3.0",
     "rxjs": "^6.5.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
     "uikit": "3.16.24",
-    "zone.js": "~0.13.1"
+    "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.7",
+    "@angular-devkit/build-angular": "^18.1.0",
-    "@angular/cli": "^16.1.7",
+    "@angular/cli": "^18.1.0",
-    "@angular/compiler-cli": "^16.1.8",
+    "@angular/compiler-cli": "^18.1.0",
-    "@angular/language-service": "^16.1.8",
+    "@angular/language-service": "^18.1.0",
-    "@nguniversal/builders": "^16.1.1",
-    "@types/express": "^4.17.0",
     "@types/compression": "^1.7.0",
-    "@types/node": "^16.18.50",
+    "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
+    "@types/node": "^18.19.1",
+    "browser-sync": "^3.0.0",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -66,7 +66,8 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.6.0",
     "protractor": "~7.0.0",
+    "replace-in-file": "^8.2.0",
     "ts-node": "~7.0.0",
-    "typescript": "~4.9.5"
+    "typescript": "~5.4.0"
   }
-}
+}

server.ts

@@ -1,31 +1,29 @@
+
 import 'zone.js/node';
 
-import { ngExpressEngine } from '@nguniversal/express-engine';
-import * as express from 'express';
-import * as compression from 'compression';
-import { join } from 'path';
-
-import { AppServerModule } from './src/main.server';
 import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
+import { CommonEngine } from '@angular/ssr';
+import * as express from 'express';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import {AppServerModule} from './src/main.server';
+import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
+import * as compression from "compression";
 import {Prometheus} from "./prometheus";
 import {Counter} from "prom-client";
-import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
 
 // The Express app is exported so that it can be used by serverless Functions.
-export function app() {
+export function app(): express.Express {
   const server = express();
   server.use(compression());
   const distFolder = join(process.cwd(), 'dist/aggregator/browser');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
-  
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
+
   const prometheus: Prometheus = new Prometheus();
-  
+
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  const commonEngine = new CommonEngine();
-  server.engine('html', ngExpressEngine({
-    bootstrap: AppServerModule,
-    inlineCriticalCss: false
-  }));
 
   server.set('view engine', 'html');
   server.set('views', distFolder);
@@ -36,59 +34,87 @@ export function app() {
   server.get('*.*', express.static(distFolder, {
     maxAge: '1y'
   }));
-  
+
   server.get('/metrics', (req, res) => {
     res.set('Content-Type', prometheus.register.contentType);
     res.end(prometheus.register.metrics());
   });
-  
+
-  // All regular routes use the Universal engine
+  server.get('/health-check', async (_req, res, _next) => {
-  server.get('*', (req, res) => {
+    var uptime = process.uptime();
+    const date = new Date(uptime*1000);
+    const days = date.getUTCDate() - 1,
+      hours = date.getUTCHours(),
+      minutes = date.getUTCMinutes(),
+      seconds = date.getUTCSeconds(),
+      milliseconds = date.getUTCMilliseconds();
+
+
+    const healthcheck = {
+      uptime: days + " days, " + hours + " hours, " + minutes + " minutes, " + seconds + " seconds, " + milliseconds + " milliseconds",
+      message: 'OK',
+      timestamp: new Date()
+    };
+    try {
+      res.send(healthcheck);
+    } catch (error) {
+      healthcheck.message = error;
+      res.status(503).send();
+    }
+  });
+
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
     let start = new Date();
     let counter: Counter = prometheus.counters.get(req.path);
     if(counter !== undefined) {
       counter.inc(1, new Date());
-      res.render(indexHtml, {
+
-        req, providers: [
+      commonEngine.render({
-          {
+        bootstrap: AppServerModule,
-            provide: APP_BASE_HREF,
+        inlineCriticalCss: false,
-            useValue: req.baseUrl
+        documentFilePath: indexHtml,
-          },
+        url: `${protocol}://${headers.host}${originalUrl}`,
-          {
+        publicPath: distFolder,
-            provide: REQUEST, useValue: (req)
+        providers: [
-          },
+          {provide: APP_BASE_HREF, useValue: baseUrl},
-          {
+          {provide: REQUEST, useValue: (req)},
-            provide: RESPONSE, useValue: (res)
+          {provide: RESPONSE, useValue: (res)}
-          }
+        ],
-        ]
+      })
-      });
+      .then((html) => {
-      // event triggers when express is done sending response
+        // event triggers when express is done sending response
-      res.on('finish', function() {
+        res.on('finish', function() {
-        console.log(new Date().getTime() - start.getTime());
+          console.log(new Date().getTime() - start.getTime());
-      });
+        });
+        res.status(200).send(html)
+      })
+      .catch((err) => res.status(500).send('Error during SSR'))
     } else {
-      res.render(indexHtml, {
+      commonEngine.render({
-        req, providers: [
+        bootstrap: AppServerModule,
-          {
+        inlineCriticalCss: false,
-            provide: APP_BASE_HREF,
+        documentFilePath: indexHtml,
-            useValue: req.baseUrl
+        url: `${protocol}://${headers.host}${originalUrl}`,
-          },
+        publicPath: distFolder,
-          {
+        providers: [
-            provide: REQUEST, useValue: (req)
+          {provide: APP_BASE_HREF, useValue: baseUrl},
-          },
+          {provide: REQUEST, useValue: (req)},
-          {
+          {provide: RESPONSE, useValue: (res)}
-            provide: RESPONSE, useValue: (res)
+        ],
-          }
+      })
-        ]
+      .then((html) => res.status(200).send(html))
-      });
+      .catch((err) => res.status(500).send('Error during SSR'))
     }
   });
 
   return server;
 }
 
-function run() {
+function run(): void {
-  const port = process.env.PORT || 4000;
+  const port = process.env['PORT'] || 4000;
 
   // Start up the Node server
   const server = app();
@@ -105,6 +131,4 @@ const mainModule = __non_webpack_require__.main;
 const moduleFilename = mainModule && mainModule.filename || '';
 if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
-}
+}
-
-export * from './src/main.server';

src/app/app.module.ts

@@ -3,7 +3,7 @@ import {SharedModule} from './shared/shared.module';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {AppComponent} from './app.component';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
 import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
@@ -17,38 +17,32 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
 import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
 import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
 
-@NgModule({
+@NgModule({ declarations: [AppComponent, OpenaireErrorPageComponent],
-  imports: [
+    exports: [AppComponent],
-    SharedModule,
+    bootstrap: [AppComponent], imports: [SharedModule,
-    BrowserAnimationsModule,
+        BrowserAnimationsModule,
-    CommonModule,
+        CommonModule,
-    HttpClientModule,
+        ErrorModule,
-    ErrorModule,
+        NavigationBarModule, FeedbackModule, BottomModule,
-    NavigationBarModule, FeedbackModule, BottomModule,
+        CookieLawModule,
-    CookieLawModule,
+        BrowserAnimationsModule,
-    BrowserAnimationsModule,
+        BrowserModule,
-    BrowserModule,
+        AppRoutingModule], providers: [
-    AppRoutingModule
+        ConfigurationService,
-  ],
+        { provide: APP_ID, useValue: 'aggregator' },
-  declarations: [AppComponent, OpenaireErrorPageComponent],
+        {
-  exports: [AppComponent],
+            provide: HTTP_INTERCEPTORS,
-  providers: [
+            useClass: HttpInterceptorService,
-    ConfigurationService,
+            multi: true
-    {provide: APP_ID, useValue: 'aggregator'},
+        },
-    {
+        {
-      provide: HTTP_INTERCEPTORS,
+            provide: HTTP_INTERCEPTORS,
-      useClass: HttpInterceptorService,
+            useClass: ErrorInterceptorService,
-      multi: true
+            multi: true
-    },
+        },
-    {
+        [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
-      provide: HTTP_INTERCEPTORS,
+        [{ provide: DEFAULT_TIMEOUT, useValue: 30000 }],
-      useClass: ErrorInterceptorService,
+        provideHttpClient(withInterceptorsFromDi())
-      multi: true
+    ] })
-    },
-    [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
-    [{provide: DEFAULT_TIMEOUT, useValue: 30000}]
-  ],
-  bootstrap: [AppComponent]
-})
 export class AppModule {
 }

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 92f799e63b8f2075278faf460852776e5fbe5704
+Subproject commit 9c93a1e306ce7abd43e3c552a2fff0240ae2f04c

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2
+Subproject commit 3c9fbe2a9c606ebaec0749cf46f819020d76f6cf