From 7ada3160f2562803b49b15056ac39f94bb734cb5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 12:46:06 +0300 Subject: [PATCH] Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version. --- explore/angular.json | 3 ++- explore/package.json | 34 ++++++++++++++++---------------- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/main.server.ts | 2 +- explore/src/test.ts | 6 ------ explore/src/tsconfig.server.json | 1 - explore/tsconfig.json | 5 +++-- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 0262983e..10d67fb3 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -280,7 +280,8 @@ "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true }, "test": { "outputHashing": "media", diff --git a/explore/package.json b/explore/package.json index 843be94f..2af22759 100644 --- a/explore/package.json +++ b/explore/package.json @@ -23,24 +23,24 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", + "@angular/animations": "^15.2.9", "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", + "@angular/common": "^15.2.9", + "@angular/compiler": "^15.2.9", + "@angular/core": "^15.2.9", + "@angular/forms": "^15.2.9", + "@angular/localize": "^15.2.9", "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/platform-server": "^14.2.3", - "@angular/router": "^14.2.3", - "@nguniversal/express-engine": "^14.2.0", + "@angular/platform-browser": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", + "@angular/platform-server": "^15.2.9", + "@angular/router": "^15.2.9", + "@nguniversal/express-engine": "^15.2.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^11.0.0", "prom-client": "^11.3.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -49,11 +49,11 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", - "@nguniversal/builders": "^14.2.0", + "@angular-devkit/build-angular": "^15.2.9", + "@angular/cli": "^15.2.9", + "@angular/compiler-cli": "^15.2.9", + "@angular/language-service": "^15.2.9", + "@nguniversal/builders": "^15.2.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index a53c4e90..3b6822c7 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 2fd57843..9cb1f835 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d diff --git a/explore/src/main.server.ts b/explore/src/main.server.ts index d2b1d6d1..708bb70f 100644 --- a/explore/src/main.server.ts +++ b/explore/src/main.server.ts @@ -12,4 +12,4 @@ if (properties.environment !== 'development') { } export {AppServerModule} from './app/app.server.module'; -export {renderModule} from '@angular/platform-server'; + diff --git a/explore/src/test.ts b/explore/src/test.ts index 6b03dbe8..ae25f27c 100644 --- a/explore/src/test.ts +++ b/explore/src/test.ts @@ -7,8 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: any; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -16,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/explore/src/tsconfig.server.json b/explore/src/tsconfig.server.json index 39f85aac..56015022 100644 --- a/explore/src/tsconfig.server.json +++ b/explore/src/tsconfig.server.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "../out-tsc/app-server", - "target": "es2016", "types": [ "node" ] diff --git a/explore/tsconfig.json b/explore/tsconfig.json index f7c5a9bf..282861fd 100644 --- a/explore/tsconfig.json +++ b/explore/tsconfig.json @@ -10,14 +10,15 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false }, // "angularCompilerOptions": { // "strictTemplates": true