chore(project): update Nx to 19

IPS-LMU · Jun 14, 2024 · 7e5640b · 7e5640b
1 parent ee51cdb
commit 7e5640b
Show file tree

Hide file tree

Showing 7 changed files with 4,511 additions and 3,386 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -24,12 +24,18 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,5 @@ deployment/
 /doc/test_deutsch.wav
 deploy.config.json
 
-.nx/cache
+.nx/cache
+.nx/workspace-data
diff --git a/.prettierignore b/.prettierignore
@@ -3,4 +3,5 @@
 /dist
 /coverage
 
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data
diff --git a/apps/transcription-portal/src/app/app.component.ts b/apps/transcription-portal/src/app/app.component.ts
@@ -23,7 +23,7 @@ import {StatisticsModalComponent} from './modals/statistics-modal/statistics-mod
 import {SettingsService} from './shared/settings.service';
 import {OHModalService} from './shared/ohmodal.service';
 import {AppSettings} from './shared/app.settings';
-import {hasProperty} from "@octra/utilities";
+import {hasProperty} from '@octra/utilities';
 
 @Component({
   selector: 'tportal-root',

diff --git a/apps/transcription-portal/src/app/app.module.ts b/apps/transcription-portal/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -48,74 +48,68 @@ import {PopoverModule} from 'ngx-bootstrap/popover';
 import {BsDropdownModule} from 'ngx-bootstrap/dropdown';
 import {AppRoutingModule} from './app-routing.module';
 import {DownloadService} from './shared/download.service';
-import { LuxonFormatPipe } from './obj/luxon-format.pipe';
+import {LuxonFormatPipe} from './obj/luxon-format.pipe';
 
-@NgModule({
-  declarations: [
-    AppComponent,
-    ToolLoaderComponent,
-    ProceedingsComponent,
-    TimePipe,
-    ExpandRowDirective,
-    FilesizePipe,
-    ContextMenuComponent,
-    ExpandDirective,
-    PopoverComponent,
-    FileInfoTableComponent,
-    ResultsTableComponent,
-    FeedbackModalComponent,
-    SplitModalComponent,
-    FirstModalComponent,
-    QueueModalComponent,
-    ProtocolFooterComponent,
-    FilePreviewModalComponent,
-    AlertComponent,
-    DownloadModalComponent,
-    OperationArrowComponent,
-    ProceedingsRowDirective,
-    ProcColIconDirective,
-    ProcColOperationDirective,
-    DirProgressDirective,
-    StatisticsModalComponent,
-    BrowserTestComponent,
-    MainComponent,
-    LuxonFormatPipe
-  ],
-  imports: [
-    BrowserModule,
-    AppRoutingModule,
-    BrowserAnimationsModule,
-    HttpClientModule,
-    NgChartsModule,
-    TooltipModule.forRoot(),
-    ModalModule.forRoot(),
-    CollapseModule.forRoot(),
-    PopoverModule.forRoot(),
-    BsDropdownModule.forRoot(),
-    NgCircleProgressModule.forRoot({
-      // set defaults here
-      radius: 40,
-      outerStrokeWidth: 16,
-      innerStrokeWidth: 8,
-      outerStrokeColor: '#78C000',
-      innerStrokeColor: '#C7E596',
-      animationDuration: 300
-    }),
-    FormsModule,
-    ReactiveFormsModule
-  ],
-  providers: [
-    TaskService,
-    NotificationService,
-    StorageService,
-    BugReportService,
-    AlertService,
-    SettingsService,
-    CompatibilityService,
-    OHModalService,
-    DownloadService
-  ],
-  bootstrap: [AppComponent]
-})
+@NgModule({ declarations: [
+        AppComponent,
+        ToolLoaderComponent,
+        ProceedingsComponent,
+        TimePipe,
+        ExpandRowDirective,
+        FilesizePipe,
+        ContextMenuComponent,
+        ExpandDirective,
+        PopoverComponent,
+        FileInfoTableComponent,
+        ResultsTableComponent,
+        FeedbackModalComponent,
+        SplitModalComponent,
+        FirstModalComponent,
+        QueueModalComponent,
+        ProtocolFooterComponent,
+        FilePreviewModalComponent,
+        AlertComponent,
+        DownloadModalComponent,
+        OperationArrowComponent,
+        ProceedingsRowDirective,
+        ProcColIconDirective,
+        ProcColOperationDirective,
+        DirProgressDirective,
+        StatisticsModalComponent,
+        BrowserTestComponent,
+        MainComponent,
+        LuxonFormatPipe
+    ],
+    bootstrap: [AppComponent], imports: [BrowserModule,
+        AppRoutingModule,
+        BrowserAnimationsModule,
+        NgChartsModule,
+        TooltipModule.forRoot(),
+        ModalModule.forRoot(),
+        CollapseModule.forRoot(),
+        PopoverModule.forRoot(),
+        BsDropdownModule.forRoot(),
+        NgCircleProgressModule.forRoot({
+            // set defaults here
+            radius: 40,
+            outerStrokeWidth: 16,
+            innerStrokeWidth: 8,
+            outerStrokeColor: '#78C000',
+            innerStrokeColor: '#C7E596',
+            animationDuration: 300
+        }),
+        FormsModule,
+        ReactiveFormsModule], providers: [
+        TaskService,
+        NotificationService,
+        StorageService,
+        BugReportService,
+        AlertService,
+        SettingsService,
+        CompatibilityService,
+        OHModalService,
+        DownloadService,
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule {
 }