diff --git a/.gitignore b/.gitignore index 86fae35..5e9454d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.angular/cache +.angular/ node_modules/ dist/ .idea/ diff --git a/angular.json b/angular.json index 8d175b9..f0b81da 100644 --- a/angular.json +++ b/angular.json @@ -279,6 +279,5 @@ } } } - }, - "defaultProject": "eosc" + } } diff --git a/package.json b/package.json index 92ce64c..d50c6a1 100644 --- a/package.json +++ b/package.json @@ -17,22 +17,22 @@ "build:ssr-beta": "npm run build-beta && ng run eosc:server:beta", "build:ssr-prod": "npm run build-prod && ng run eosc:server:production", "prerender": "ng run eosc:prerender", - "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .git*" + "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .angular .git*" }, "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", @@ -47,10 +47,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/express": "^4.17.0", "@types/compression": "^1.7.0", @@ -69,4 +69,4 @@ "ts-node": "~7.0.0", "typescript": "~4.6.4" } -} \ No newline at end of file +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 34b4009..fd0adef 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -128,7 +128,7 @@ export class AppRoutingModule { })); } getOptionalRoutes(){ - let optionalRoutes = [ + let optionalRoutes: Routes = [ // Deposit Pages { path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, { path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index db7f34a..105e506 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b +Subproject commit 105e5066f28497fcd0d51c31e3f30df3d0043ccf 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" ],