diff --git a/angular.json b/angular.json index cb3eb7e..4f72345 100644 --- a/angular.json +++ b/angular.json @@ -212,14 +212,16 @@ "main": "server.ts", "tsConfig": "src/tsconfig.server.json", "sourceMap": true, - "optimization": false + "optimization": false, + "buildOptimizer": false }, "configurations": { "development": { "outputHashing": "media", "sourceMap": false, "optimization": true, - "vendorChunk": true + "vendorChunk": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -230,7 +232,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -241,7 +244,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/package.json b/package.json index f99d9ad..8804fe3 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,19 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.9", + "@angular/animations": "^16.1.8", "@angular/cdk": "^15.2.9", - "@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/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", "@angular/material": "^15.2.9", - "@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", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@angular/platform-server": "^16.1.8", + "@angular/router": "^16.1.8", + "@nguniversal/express-engine": "^16.1.1", "@node-minify/clean-css": "^6.2.0", "@node-minify/core": "^6.2.0", "axios": "^0.27.2", @@ -41,7 +41,7 @@ "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^11.0.0", + "ng-recaptcha": "^12.0.2", "ng2-ckeditor": "1.3.7", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", @@ -50,11 +50,11 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@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", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@angular/language-service": "^16.1.8", + "@nguniversal/builders": "^16.1.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ef485d0..630a5fb 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,7 +28,7 @@ import {LoginErrorCodes} from "./openaireLibrary/login/utils/guardHelper.class"; import {Layout} from "./openaireLibrary/connect/community/CustomizationOptions"; import {CustomizationService} from "./openaireLibrary/services/customization.service"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; -import {makeStateKey, Meta, StateKey, TransferState} from "@angular/platform-browser"; +import {makeStateKey, StateKey, TransferState} from "@angular/core"; import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo"; import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; @@ -42,6 +42,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields" import {DOCUMENT, isPlatformServer} from "@angular/common"; import {AdvancedAsyncSubject} from "./openaireLibrary/utils/AdvancedAsyncSubject"; import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {Meta} from "@angular/platform-browser"; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 363c148..4913b10 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,8 +1,8 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {CommonModule} from '@angular/common'; import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http"; -import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; +import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {AppComponent} from './app.component'; @@ -41,9 +41,8 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser BottomModule, CookieLawModule, SubscribeModule.forRoot(), InviteBasicModule, - BrowserModule.withServerTransition({appId: 'serverApp'}), + BrowserModule, AppRoutingModule, - BrowserTransferStateModule, BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule, RoleVerificationModule, QuickContactModule, AlertModalModule ], @@ -51,6 +50,7 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser exports: [AppComponent], providers: [ CommunitiesService, CustomizationService, IsCommunity, SubscribeService, + {provide: APP_ID, useValue: 'serverApp'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..e742988 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4