Update angular to version 16
This commit is contained in:
parent
658e92f144
commit
5bd1ab15ef
12
angular.json
12
angular.json
|
@ -208,14 +208,16 @@
|
||||||
"main": "server.ts",
|
"main": "server.ts",
|
||||||
"tsConfig": "src/tsconfig.server.json",
|
"tsConfig": "src/tsconfig.server.json",
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"optimization": false
|
"optimization": false,
|
||||||
|
"buildOptimizer": false
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"development": {
|
"development": {
|
||||||
"outputHashing": "media",
|
"outputHashing": "media",
|
||||||
"sourceMap": false,
|
"sourceMap": false,
|
||||||
"optimization": true,
|
"optimization": true,
|
||||||
"vendorChunk": true
|
"vendorChunk": true,
|
||||||
|
"buildOptimizer": true
|
||||||
},
|
},
|
||||||
"beta": {
|
"beta": {
|
||||||
"outputHashing": "media",
|
"outputHashing": "media",
|
||||||
|
@ -226,7 +228,8 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"sourceMap": false,
|
"sourceMap": false,
|
||||||
"optimization": true
|
"optimization": true,
|
||||||
|
"buildOptimizer": true
|
||||||
},
|
},
|
||||||
"production": {
|
"production": {
|
||||||
"outputHashing": "media",
|
"outputHashing": "media",
|
||||||
|
@ -237,7 +240,8 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"sourceMap": false,
|
"sourceMap": false,
|
||||||
"optimization": true
|
"optimization": true,
|
||||||
|
"buildOptimizer": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"defaultConfiguration": ""
|
"defaultConfiguration": ""
|
||||||
|
|
34
package.json
34
package.json
|
@ -21,25 +21,25 @@
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^15.2.9",
|
"@angular/animations": "^16.1.7",
|
||||||
"@angular/cdk": "^15.2.9",
|
"@angular/cdk": "^15.2.9",
|
||||||
"@angular/common": "^15.2.9",
|
"@angular/common": "^16.1.7",
|
||||||
"@angular/compiler": "^15.2.9",
|
"@angular/compiler": "^16.1.7",
|
||||||
"@angular/core": "^15.2.9",
|
"@angular/core": "^16.1.7",
|
||||||
"@angular/forms": "^15.2.9",
|
"@angular/forms": "^16.1.7",
|
||||||
"@angular/localize": "^15.2.9",
|
"@angular/localize": "^16.1.7",
|
||||||
"@angular/material": "^15.2.9",
|
"@angular/material": "^15.2.9",
|
||||||
"@angular/platform-browser": "^15.2.9",
|
"@angular/platform-browser": "^16.1.7",
|
||||||
"@angular/platform-browser-dynamic": "^15.2.9",
|
"@angular/platform-browser-dynamic": "^16.1.7",
|
||||||
"@angular/platform-server": "^15.2.9",
|
"@angular/platform-server": "^16.1.7",
|
||||||
"@angular/router": "^15.2.9",
|
"@angular/router": "^16.1.7",
|
||||||
"@nguniversal/express-engine": "^15.2.1",
|
"@nguniversal/express-engine": "^16.1.1",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"clipboard": "^1.5.16",
|
"clipboard": "^1.5.16",
|
||||||
"core-js": "^2.5.4",
|
"core-js": "^2.5.4",
|
||||||
"express": "^4.15.2",
|
"express": "^4.15.2",
|
||||||
"jquery": "^3.4.1",
|
"jquery": "^3.4.1",
|
||||||
"ng-recaptcha": "^11.0.0",
|
"ng-recaptcha": "^12.0.2",
|
||||||
"ng2-ckeditor": "1.3.7",
|
"ng2-ckeditor": "1.3.7",
|
||||||
"rxjs": "^6.5.1",
|
"rxjs": "^6.5.1",
|
||||||
"ts-md5": "^1.2.0",
|
"ts-md5": "^1.2.0",
|
||||||
|
@ -48,11 +48,11 @@
|
||||||
"zone.js": "~0.13.1"
|
"zone.js": "~0.13.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "^15.2.9",
|
"@angular-devkit/build-angular": "^16.1.6",
|
||||||
"@angular/cli": "^15.2.9",
|
"@angular/cli": "^16.1.6",
|
||||||
"@angular/compiler-cli": "^15.2.9",
|
"@angular/compiler-cli": "^16.1.7",
|
||||||
"@angular/language-service": "^15.2.9",
|
"@angular/language-service": "^16.1.7",
|
||||||
"@nguniversal/builders": "^15.2.1",
|
"@nguniversal/builders": "^16.1.1",
|
||||||
"@types/ckeditor": "^4.9.10",
|
"@types/ckeditor": "^4.9.10",
|
||||||
"@types/compression": "^1.7.0",
|
"@types/compression": "^1.7.0",
|
||||||
"@types/express": "^4.17.0",
|
"@types/express": "^4.17.0",
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import {NgModule} from '@angular/core';
|
import {inject, NgModule} from '@angular/core';
|
||||||
import {RouterModule, Routes} from '@angular/router';
|
import {ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes} from '@angular/router';
|
||||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||||
import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
|
import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
|
||||||
import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
|
import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import {NgModule} from '@angular/core';
|
import {APP_ID, NgModule} from '@angular/core';
|
||||||
import {FormsModule} from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
|
import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
|
||||||
|
@ -43,13 +43,14 @@ import {CacheIndicatorsModule} from "./cache-indicators/cache-indicators.module"
|
||||||
NavigationBarModule,
|
NavigationBarModule,
|
||||||
BottomModule,
|
BottomModule,
|
||||||
CookieLawModule,
|
CookieLawModule,
|
||||||
BrowserModule.withServerTransition({appId: 'serverApp'}),
|
BrowserModule,
|
||||||
AppRoutingModule,
|
AppRoutingModule,
|
||||||
SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule
|
SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule
|
||||||
],
|
],
|
||||||
declarations: [AppComponent, OpenaireErrorPageComponent],
|
declarations: [AppComponent, OpenaireErrorPageComponent],
|
||||||
exports: [AppComponent],
|
exports: [AppComponent],
|
||||||
providers: [
|
providers: [
|
||||||
|
{provide: APP_ID, useValue: 'serverApp'},
|
||||||
AdminLoginGuard, AdminDashboardGuard, LoginGuard,
|
AdminLoginGuard, AdminDashboardGuard, LoginGuard,
|
||||||
{
|
{
|
||||||
provide: HTTP_INTERCEPTORS,
|
provide: HTTP_INTERCEPTORS,
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e
|
Subproject commit 51e39801796e6c49c97cc721c7b1e797a45a8880
|
|
@ -1,12 +1,5 @@
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {
|
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
|
||||||
ActivatedRouteSnapshot,
|
|
||||||
CanActivate,
|
|
||||||
CanActivateChild,
|
|
||||||
Router,
|
|
||||||
RouterStateSnapshot,
|
|
||||||
UrlTree
|
|
||||||
} from '@angular/router';
|
|
||||||
import {map, take, tap} from "rxjs/operators";
|
import {map, take, tap} from "rxjs/operators";
|
||||||
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
||||||
import {LoginErrorCodes} from "../openaireLibrary/login/utils/guardHelper.class";
|
import {LoginErrorCodes} from "../openaireLibrary/login/utils/guardHelper.class";
|
||||||
|
@ -17,7 +10,7 @@ import {error} from "protractor";
|
||||||
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AdminDashboardGuard implements CanActivate, CanActivateChild {
|
export class AdminDashboardGuard {
|
||||||
|
|
||||||
constructor(private router: Router,
|
constructor(private router: Router,
|
||||||
private stakeholderService: StakeholderService,
|
private stakeholderService: StakeholderService,
|
||||||
|
|
Loading…
Reference in New Issue