Angular 18 migration
This commit is contained in:
parent
c1cb147968
commit
b1e93a9334
@ -14,22 +14,22 @@
|
|||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^17.3.12",
|
"@angular/animations": "^18.2.6",
|
||||||
"@angular/cdk": "^17.3.10",
|
"@angular/cdk": "^17.3.10",
|
||||||
"@angular/common": "^17.3.12",
|
"@angular/common": "^18.2.6",
|
||||||
"@angular/compiler": "^17.3.12",
|
"@angular/compiler": "^18.2.6",
|
||||||
"@angular/core": "^17.3.12",
|
"@angular/core": "^18.2.6",
|
||||||
"@angular/flex-layout": "^15.0.0-beta.42",
|
"@angular/flex-layout": "^15.0.0-beta.42",
|
||||||
"@angular/forms": "^17.3.12",
|
"@angular/forms": "^18.2.6",
|
||||||
"@angular/material": "^17.3.10",
|
"@angular/material": "^17.3.10",
|
||||||
"@angular/platform-browser": "^17.3.12",
|
"@angular/platform-browser": "^18.2.6",
|
||||||
"@angular/platform-browser-dynamic": "^17.3.12",
|
"@angular/platform-browser-dynamic": "^18.2.6",
|
||||||
"@angular/router": "^17.3.12",
|
"@angular/router": "^18.2.6",
|
||||||
"@auth0/angular-jwt": "^5.1.2",
|
"@auth0/angular-jwt": "^5.1.2",
|
||||||
"@date-io/core": "1.3.7",
|
"@date-io/core": "1.3.7",
|
||||||
"@date-io/date-fns": "1.3.7",
|
"@date-io/date-fns": "1.3.7",
|
||||||
"@flowjs/flow.js": "^2.14.1",
|
"@flowjs/flow.js": "^2.14.1",
|
||||||
"@flowjs/ngx-flow": "~0.7.2",
|
"@flowjs/ngx-flow": "~0.8.1",
|
||||||
"@geoman-io/leaflet-geoman-free": "2.14.2",
|
"@geoman-io/leaflet-geoman-free": "2.14.2",
|
||||||
"@iplab/ngx-color-picker": "^17.2.2",
|
"@iplab/ngx-color-picker": "^17.2.2",
|
||||||
"@mat-datetimepicker/core": "~13.0.2",
|
"@mat-datetimepicker/core": "~13.0.2",
|
||||||
@ -111,18 +111,18 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "~17.0.2",
|
"@angular-builders/custom-webpack": "~17.0.2",
|
||||||
"@angular-devkit/build-angular": "^17.3.10",
|
"@angular-devkit/build-angular": "^18.2.6",
|
||||||
"@angular-devkit/core": "^18.2.6",
|
"@angular-devkit/core": "^18.2.6",
|
||||||
"@angular-devkit/schematics": "^18.2.6",
|
"@angular-devkit/schematics": "^18.2.6",
|
||||||
"@angular-eslint/builder": "17.5.2",
|
"@angular-eslint/builder": "18.3.1",
|
||||||
"@angular-eslint/eslint-plugin": "17.5.2",
|
"@angular-eslint/eslint-plugin": "18.3.1",
|
||||||
"@angular-eslint/eslint-plugin-template": "17.5.2",
|
"@angular-eslint/eslint-plugin-template": "18.3.1",
|
||||||
"@angular-eslint/schematics": "17.5.2",
|
"@angular-eslint/schematics": "18.3.1",
|
||||||
"@angular-eslint/template-parser": "17.5.2",
|
"@angular-eslint/template-parser": "18.3.1",
|
||||||
"@angular/cli": "^17.3.10",
|
"@angular/cli": "^18.2.6",
|
||||||
"@angular/compiler-cli": "^17.3.12",
|
"@angular/compiler-cli": "^18.2.6",
|
||||||
"@angular/language-service": "^17.3.12",
|
"@angular/language-service": "^18.2.6",
|
||||||
"@ngtools/webpack": "17.3.10",
|
"@ngtools/webpack": "18.2.6",
|
||||||
"@types/ace-diff": "^2.1.1",
|
"@types/ace-diff": "^2.1.1",
|
||||||
"@types/canvas-gauges": "^2.1.4",
|
"@types/canvas-gauges": "^2.1.4",
|
||||||
"@types/flot": "^0.0.32",
|
"@types/flot": "^0.0.32",
|
||||||
@ -167,7 +167,7 @@
|
|||||||
"protractor": "~7.0.0",
|
"protractor": "~7.0.0",
|
||||||
"raw-loader": "^4.0.2",
|
"raw-loader": "^4.0.2",
|
||||||
"ts-node": "^10.9.1",
|
"ts-node": "^10.9.1",
|
||||||
"typescript": "~5.2.2",
|
"typescript": "~5.5.4",
|
||||||
"webpack": "5.77.0"
|
"webpack": "5.77.0"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
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 { StoreModule } from '@ngrx/store';
|
import { StoreModule } from '@ngrx/store';
|
||||||
import { EffectsModule } from '@ngrx/effects';
|
import { EffectsModule } from '@ngrx/effects';
|
||||||
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
|
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
|
||||||
@ -43,15 +43,11 @@ import { TranslateDefaultParser } from '@core/translate/translate-default-parser
|
|||||||
import { TranslateDefaultLoader } from '@core/translate/translate-default-loader';
|
import { TranslateDefaultLoader } from '@core/translate/translate-default-loader';
|
||||||
import { EntityConflictInterceptor } from '@core/interceptors/entity-conflict.interceptor';
|
import { EntityConflictInterceptor } from '@core/interceptors/entity-conflict.interceptor';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({ exports: [], imports: [CommonModule,
|
||||||
imports: [
|
FlexLayoutModule.withConfig({ addFlexToParent: false }),
|
||||||
CommonModule,
|
|
||||||
HttpClientModule,
|
|
||||||
FlexLayoutModule.withConfig({addFlexToParent: false}),
|
|
||||||
MatDialogModule,
|
MatDialogModule,
|
||||||
MatButtonModule,
|
MatButtonModule,
|
||||||
MatSnackBarModule,
|
MatSnackBarModule,
|
||||||
|
|
||||||
// ngx-translate
|
// ngx-translate
|
||||||
TranslateModule.forRoot({
|
TranslateModule.forRoot({
|
||||||
loader: {
|
loader: {
|
||||||
@ -72,25 +68,21 @@ import { EntityConflictInterceptor } from '@core/interceptors/entity-conflict.in
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
HotkeyModule.forRoot(),
|
HotkeyModule.forRoot(),
|
||||||
|
|
||||||
// ngrx
|
// ngrx
|
||||||
StoreModule.forRoot(reducers,
|
StoreModule.forRoot(reducers, { metaReducers,
|
||||||
{ metaReducers,
|
|
||||||
runtimeChecks: {
|
runtimeChecks: {
|
||||||
strictStateImmutability: true,
|
strictStateImmutability: true,
|
||||||
strictActionImmutability: true,
|
strictActionImmutability: true,
|
||||||
strictStateSerializability: true,
|
strictStateSerializability: true,
|
||||||
strictActionSerializability: true
|
strictActionSerializability: true
|
||||||
}}
|
} }),
|
||||||
),
|
|
||||||
EffectsModule.forRoot(effects),
|
EffectsModule.forRoot(effects),
|
||||||
env.production
|
env.production
|
||||||
? []
|
? []
|
||||||
: StoreDevtoolsModule.instrument({
|
: StoreDevtoolsModule.instrument({
|
||||||
name: env.appTitle
|
name: env.appTitle,
|
||||||
, connectInZone: true})
|
connectInZone: true
|
||||||
],
|
})], providers: [
|
||||||
providers: [
|
|
||||||
{
|
{
|
||||||
provide: HTTP_INTERCEPTORS,
|
provide: HTTP_INTERCEPTORS,
|
||||||
useClass: GlobalHttpInterceptor,
|
useClass: GlobalHttpInterceptor,
|
||||||
@ -108,9 +100,8 @@ import { EntityConflictInterceptor } from '@core/interceptors/entity-conflict.in
|
|||||||
restoreFocus: false
|
restoreFocus: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
WINDOW_PROVIDERS
|
WINDOW_PROVIDERS,
|
||||||
],
|
provideHttpClient(withInterceptorsFromDi())
|
||||||
exports: []
|
] })
|
||||||
})
|
|
||||||
export class CoreModule {
|
export class CoreModule {
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,15 +15,7 @@
|
|||||||
///
|
///
|
||||||
|
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import {
|
import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpParams, HttpRequest, HttpStatusCode } from '@angular/common/http';
|
||||||
HttpErrorResponse,
|
|
||||||
HttpEvent,
|
|
||||||
HttpHandler,
|
|
||||||
HttpInterceptor,
|
|
||||||
HttpParams,
|
|
||||||
HttpRequest,
|
|
||||||
HttpStatusCode
|
|
||||||
} from '@angular/common/http';
|
|
||||||
import { Observable, of, throwError } from 'rxjs';
|
import { Observable, of, throwError } from 'rxjs';
|
||||||
import { catchError, switchMap } from 'rxjs/operators';
|
import { catchError, switchMap } from 'rxjs/operators';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
|
|||||||
@ -6,15 +6,14 @@
|
|||||||
"forceConsistentCasingInFileNames": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
"noFallthroughCasesInSwitch": true,
|
"noFallthroughCasesInSwitch": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
"declaration": false,
|
"declaration": false,
|
||||||
"downlevelIteration": true,
|
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "es2020",
|
"module": "es2020",
|
||||||
"emitDecoratorMetadata": true,
|
"emitDecoratorMetadata": true,
|
||||||
"allowSyntheticDefaultImports": true,
|
|
||||||
"jsx": "react",
|
"jsx": "react",
|
||||||
"typeRoots": [
|
"typeRoots": [
|
||||||
"node_modules/@types",
|
"node_modules/@types",
|
||||||
|
|||||||
2638
ui-ngx/yarn.lock
2638
ui-ngx/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user