From c984fb85bb77899fdc6cf51c57aa27c7aabc8b3d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 15:36:10 +0300 Subject: [PATCH] Update angular core and cli to version 14 --- angular.json | 3 +-- package.json | 28 ++++++++++---------- src/app/app.component.ts | 6 ++--- src/app/contact/contact.component.ts | 6 ++--- src/app/get-started/get-started.component.ts | 6 ++--- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- tsconfig.json | 2 +- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/angular.json b/angular.json index 9117cb0..6af318d 100644 --- a/angular.json +++ b/angular.json @@ -269,6 +269,5 @@ } } } - }, - "defaultProject": "monitor" + } } diff --git a/package.json b/package.json index e0e2ef5..468fc6d 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,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", @@ -46,10 +46,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/src/app/app.component.ts b/src/app/app.component.ts index 4fbe80f..06e0491 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -12,7 +12,7 @@ import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {QuickContactService} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.service'; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {Composer} from "./openaireLibrary/utils/email/composer"; import {NotificationHandler} from "./openaireLibrary/utils/notification-handler"; import {EmailService} from "./openaireLibrary/utils/email/email.service"; @@ -82,7 +82,7 @@ export class AppComponent { /* Contact */ public showQuickContact: boolean; public showGetStarted: boolean = true; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; public organizationTypes: string[] = [ 'Funding agency', 'University / Research Center', 'Research Infrastructure', 'Government', @@ -99,7 +99,7 @@ export class AppComponent { private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll, private userManagementService: UserManagementService, private quickContactService: QuickContactService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private emailService: EmailService, private resourcesService: ResourcesService) { this.subscriptions.push(router.events.forEach((event) => { diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index a92d922..f1ff45d 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -7,7 +7,7 @@ import {Meta, Title} from "@angular/platform-browser"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @@ -33,7 +33,7 @@ export class ContactComponent implements OnInit { 'Research Infrastructure', 'Government', 'Non-profit', 'Industry', 'Other' ]; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; @ViewChild('modal') modal; private subscriptions = []; @@ -44,7 +44,7 @@ export class ContactComponent implements OnInit { private _title: Title, private seoService: SEOService, private _piwikService: PiwikService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private helper: HelperService) { } diff --git a/src/app/get-started/get-started.component.ts b/src/app/get-started/get-started.component.ts index ad6a805..f0836c1 100644 --- a/src/app/get-started/get-started.component.ts +++ b/src/app/get-started/get-started.component.ts @@ -7,7 +7,7 @@ import {Meta, Title} from "@angular/platform-browser"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @@ -34,7 +34,7 @@ export class GetStartedComponent implements OnInit { 'Research Infrastructure', 'Government', 'Non-profit', 'Industry', 'Other' ]; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; @ViewChild('modal') modal; private subscriptions = []; public stakeholderEntities = StakeholderEntities; @@ -46,7 +46,7 @@ export class GetStartedComponent implements OnInit { private _title: Title, private seoService: SEOService, private _piwikService: PiwikService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private helper: HelperService) { } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index db7f34a..0854b9d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b +Subproject commit 0854b9ddd0cddf0f87915743b40396b42958b349 diff --git a/src/assets/common-assets b/src/assets/common-assets index b3b48a9..85ad768 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 +Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0 diff --git a/tsconfig.json b/tsconfig.json index 85001d5..fc8b4c1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2015", + "target": "es2020", "typeRoots": [ "node_modules/@types" ],