From 94a59dc5a63a72e1ad830b1ee4d60811823586a2 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 23 Sep 2022 15:51:21 +0300 Subject: [PATCH] update angular core and cli to v14 --- explore/angular.json | 3 +-- explore/package.json | 28 ++++++++++++++-------------- explore/src/app/fos/fos.component.ts | 6 +++--- explore/tsconfig.json | 2 +- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 2672864c..787cdd99 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -337,6 +337,5 @@ } } } - }, - "defaultProject": "explore" + } } diff --git a/explore/package.json b/explore/package.json index 3055c98f..54a7b55c 100644 --- a/explore/package.json +++ b/explore/package.json @@ -23,18 +23,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "~13.3.11", + "@angular/animations": "^14.2.3", "@angular/cdk": "^13.3.9", - "@angular/common": "~13.3.11", - "@angular/compiler": "~13.3.11", - "@angular/core": "~13.3.11", - "@angular/forms": "~13.3.11", - "@angular/localize": "^13.3.11", + "@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/material": "^13.3.9", - "@angular/platform-browser": "~13.3.11", - "@angular/platform-browser-dynamic": "~13.3.11", - "@angular/platform-server": "~13.3.11", - "@angular/router": "~13.3.11", + "@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": "^13.1.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", @@ -49,10 +49,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~13.3.9", - "@angular/cli": "~13.3.9", - "@angular/compiler-cli": "~13.3.11", - "@angular/language-service": "~13.3.11", + "@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": "^13.1.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts index dc588ea3..d43eeeda 100644 --- a/explore/src/app/fos/fos.component.ts +++ b/explore/src/app/fos/fos.component.ts @@ -5,7 +5,7 @@ import {Subscription} from "rxjs"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; import {properties} from "src/environments/environment"; -import {FormBuilder, FormControl} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormControl} from "@angular/forms"; import {ActivatedRoute, Router} from "@angular/router"; import {Meta, Title} from "@angular/platform-browser"; import {Location} from "@angular/common"; @@ -27,7 +27,7 @@ export class FosComponent implements OnInit, OnDestroy { public fosOptions: string[] = []; public index: number = 0; - public keywordControl: FormControl; + public keywordControl: UntypedFormControl; public keyword: string = null; public viewResults = []; @@ -41,7 +41,7 @@ export class FosComponent implements OnInit, OnDestroy { constructor( private httpClient: HttpClient, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private location: Location, private route: ActivatedRoute, private _router: Router, diff --git a/explore/tsconfig.json b/explore/tsconfig.json index 85001d5a..fc8b4c1a 100644 --- a/explore/tsconfig.json +++ b/explore/tsconfig.json @@ -10,7 +10,7 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2015", + "target": "es2020", "typeRoots": [ "node_modules/@types" ],