MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

[angular-18 | WIP] upgrade angular core and cli to v18, change submodules to angular 18 as well

This commit is contained in:
Alex Martzios 2024-07-15 11:34:10 +03:00
parent c7e1fe316b
commit 86c2a5042c
3 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
explore/package.json
View File

@ -23,19 +23,19 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^17.3.11", "@angular/animations": "^18.1.0",
"@angular/cdk": "^17.3.10", "@angular/cdk": "^17.3.10",
"@angular/common": "^17.3.11", "@angular/common": "^18.1.0",
"@angular/compiler": "^17.3.11", "@angular/compiler": "^18.1.0",
"@angular/core": "^17.3.11", "@angular/core": "^18.1.0",
"@angular/forms": "^17.3.11", "@angular/forms": "^18.1.0",
"@angular/localize": "^17.3.11", "@angular/localize": "^18.1.0",
"@angular/material": "^17.3.10", "@angular/material": "^17.3.10",
"@angular/platform-browser": "^17.3.11", "@angular/platform-browser": "^18.1.0",
"@angular/platform-browser-dynamic": "^17.3.11", "@angular/platform-browser-dynamic": "^18.1.0",
"@angular/platform-server": "^17.3.11", "@angular/platform-server": "^18.1.0",
"@angular/router": "^17.3.11", "@angular/router": "^18.1.0",
"@angular/ssr": "^17.3.8", "@angular/ssr": "^18.1.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",
@ -50,10 +50,10 @@
"zone.js": "~0.14.0" "zone.js": "~0.14.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^17.3.8", "@angular-devkit/build-angular": "^18.1.0",
"@angular/cli": "^17.3.8", "@angular/cli": "^18.1.0",
"@angular/compiler-cli": "^17.3.11", "@angular/compiler-cli": "^18.1.0",
"@angular/language-service": "^17.3.11", "@angular/language-service": "^18.1.0",
"@types/compression": "^1.7.0", "@types/compression": "^1.7.0",
"@types/express": "^4.17.0", "@types/express": "^4.17.0",
"@types/jasmine": "~3.6.0", "@types/jasmine": "~3.6.0",

74
explore/src/app/app.module.ts
View File

@ -3,7 +3,7 @@ import {SharedModule} from './openaireLibrary/shared/shared.module';
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http'; import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import {AppComponent} from './app.component'; import {AppComponent} from './app.component';
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module'; import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
@ -20,45 +20,39 @@ import {QuickContactModule} from './openaireLibrary/sharedComponents/quick-conta
import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module'; import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module';
import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module"; import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
@NgModule({ @NgModule({ declarations: [AppComponent],
imports: [ exports: [AppComponent],
SharedModule, bootstrap: [AppComponent], imports: [SharedModule,
CommonModule, CommonModule,
HttpClientModule, ErrorModule,
ErrorModule, NavigationBarModule, BottomModule,
NavigationBarModule, BottomModule, CookieLawModule,
CookieLawModule, BrowserModule,
BrowserModule, AppRoutingModule,
AppRoutingModule, BrowserAnimationsModule, PageURLResolverModule,
BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule,
Schema2jsonldModule, QuickContactModule,
QuickContactModule, AlertModalModule, LoadingModule], providers: [
AlertModalModule, LoadingModule { provide: APP_ID, useValue: 'explore' },
], // {
declarations: [AppComponent], // provide: HTTP_INTERCEPTORS,
exports: [AppComponent], // useClass: CacheInterceptorService,
providers: [ // multi: true
{provide: APP_ID, useValue: 'explore'}, // },
// { {
// provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
// useClass: CacheInterceptorService, useClass: HttpInterceptorService,
// multi: true multi: true
// }, },
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: HttpInterceptorService, useClass: ErrorInterceptorService,
multi: true multi: true
}, },
{ [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
provide: HTTP_INTERCEPTORS, [{ provide: DEFAULT_TIMEOUT, useValue: 3000 }],
useClass: ErrorInterceptorService, provideHttpClient(withInterceptorsFromDi())
multi: true ] })
},
[{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
[{provide: DEFAULT_TIMEOUT, useValue: 3000}]
],
bootstrap: [AppComponent]
})
// //
export class AppModule { export class AppModule {
} }

2
explore/src/assets/common-assets

@ -1 +1 @@
Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 Subproject commit eb0051dc347cdaa44476048dea9f6b61200f257f