Skip to content

Commit fb5e6cd

Browse files
authored
Bump eslint deps (#1323)
* Bump eslint deps * Made it all standalone
1 parent 70bfbf6 commit fb5e6cd

File tree

9 files changed

+668
-1120
lines changed

9 files changed

+668
-1120
lines changed

package-lock.json

Lines changed: 603 additions & 1042 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
},
4747
"devDependencies": {
4848
"@angular-devkit/build-angular": "^20.1.1",
49-
"@angular-eslint/builder": "^18.3.0",
50-
"@angular-eslint/eslint-plugin": "^18.3.0",
51-
"@angular-eslint/eslint-plugin-template": "^18.3.0",
52-
"@angular-eslint/schematics": "^18.3.0",
53-
"@angular-eslint/template-parser": "^18.3.0",
49+
"@angular-eslint/builder": "20.1.1",
50+
"@angular-eslint/eslint-plugin": "20.1.1",
51+
"@angular-eslint/eslint-plugin-template": "20.1.1",
52+
"@angular-eslint/schematics": "20.1.1",
53+
"@angular-eslint/template-parser": "20.1.1",
5454
"@angular/cli": "^20.1.1",
5555
"@angular/compiler-cli": "20.1.2",
5656
"@angular/language-service": "20.1.2",
@@ -62,7 +62,7 @@
6262
"@typescript-eslint/eslint-plugin": "8.38.0",
6363
"@typescript-eslint/parser": "8.38.0",
6464
"concurrently": "8.2.2",
65-
"eslint": "8.57.0",
65+
"eslint": "9.31.0",
6666
"jasmine-core": "5.1.2",
6767
"jasmine-spec-reporter": "7.0.0",
6868
"jquery": "3.7.1",

src/app/api-interactions.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import { each, isEmpty } from 'lodash-es';
22
import { SeriesVolume, Comic, MarvelAPISeriesResponse } from './models';
33
import { HttpParams, HttpClient } from '@angular/common/http';
4-
import { Injectable } from '@angular/core';
4+
import { Injectable, inject } from '@angular/core';
55

66
const MARVEL_API_BASE_URL = 'https://gateway.marvel.com/v1/public/';
77
const MARVEL_API_KEY_PUBLIC = '46a863fa31f601aacb87dae9cb8f7c45';
88

99
@Injectable()
1010
export class ApiInteractions {
11-
constructor(
12-
public http: HttpClient,
13-
) { }
11+
http = inject(HttpClient);
12+
1413

1514
/**
1615
* @param seriesVolume the series volume object

src/app/app.component.ts

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ import {
1515
sortBy
1616
} from 'lodash-es';
1717
import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout';
18-
import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
19-
import { MatDialog } from '@angular/material/dialog';
18+
import { Component, OnInit, ChangeDetectorRef, inject } from '@angular/core';
19+
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
2020
import { ActivatedRoute, Router, UrlTree } from '@angular/router';
21-
21+
import { MatButtonModule } from '@angular/material/button';
22+
import { MatTooltip } from '@angular/material/tooltip';
23+
import { MatIconModule } from '@angular/material/icon';
24+
import { CommonModule } from '@angular/common';
25+
import { MatMenuModule } from '@angular/material/menu';
26+
import { FormsModule } from '@angular/forms';
27+
28+
import { FilterPipe } from './filter.pipe';
29+
import { LimitToPipe } from './limitTo.pipe';
2230
import { InfoModalComponent } from './info-modal/info-modal.component';
2331
import { ApiInteractions } from './api-interactions';
2432
import { Collections } from './../database/collections';
@@ -62,20 +70,34 @@ const COLLECTIONS_CONTAINER_HEIGHT = 298;
6270
const DEFAULT_COMIC_THUMBNAILS_OFFSET_TOP = BODY_PADDING_TOP + DATES_CONTAINER_HEIGHT;
6371

6472
@Component({
65-
selector: 'app-root',
66-
templateUrl: './app.component.html',
67-
styleUrls: ['./app.component.less'],
68-
standalone: false
73+
imports: [
74+
CommonModule,
75+
FilterPipe,
76+
FormsModule,
77+
LimitToPipe,
78+
MatButtonModule,
79+
MatIconModule,
80+
MatDialogModule,
81+
MatIconModule,
82+
MatMenuModule,
83+
MatTooltip,
84+
],
85+
providers: [
86+
ApiInteractions,
87+
],
88+
selector: 'app-root',
89+
styleUrls: ['./app.component.less'],
90+
templateUrl: './app.component.html',
6991
})
7092
export class AppComponent implements OnInit {
71-
constructor(
72-
private apiInteractions: ApiInteractions,
73-
private breakpointObserver: BreakpointObserver,
74-
private changeDetector: ChangeDetectorRef,
75-
public dialog: MatDialog,
76-
private route: ActivatedRoute,
77-
private router: Router,
78-
) {
93+
private apiInteractions = inject(ApiInteractions);
94+
private breakpointObserver = inject(BreakpointObserver);
95+
private changeDetector = inject(ChangeDetectorRef);
96+
dialog = inject(MatDialog);
97+
private route = inject(ActivatedRoute);
98+
private router = inject(Router);
99+
100+
constructor() {
79101
// detect screen size changes
80102
this.breakpointObserver.observe([
81103
"(max-width: 768px)"

src/app/app.module.ts

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/app/filter.pipe.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Pipe, PipeTransform } from '@angular/core';
22
@Pipe({
33
name: 'filter',
4-
standalone: false
54
})
65
export class FilterPipe implements PipeTransform {
76
transform(items: any[], searchText: string): any[] {

src/app/info-modal/info-modal.component.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { Component, Inject } from '@angular/core';
2-
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
1+
import { Component, inject } from '@angular/core';
2+
import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
33

44
@Component({
5-
selector: 'app-info-modal',
6-
templateUrl: 'info-modal.component.html',
7-
standalone: false
5+
imports: [
6+
MatDialogModule,
7+
],
8+
selector: 'app-info-modal',
9+
templateUrl: 'info-modal.component.html',
810
})
911
export class InfoModalComponent {
10-
constructor(
11-
public dialogRef: MatDialogRef<InfoModalComponent>,
12-
@Inject(MAT_DIALOG_DATA) public data,
13-
) {}
12+
dialogRef = inject<MatDialogRef<InfoModalComponent>>(MatDialogRef);
13+
data = inject(MAT_DIALOG_DATA);
1414

1515
onNoClick(): void {
1616
this.dialogRef.close();

src/app/limitTo.pipe.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Pipe, PipeTransform } from '@angular/core';
22
@Pipe({
33
name: 'limitTo',
4-
standalone: false
54
})
65
export class LimitToPipe implements PipeTransform {
76
transform(items: any[], limit: number = 20): any[] {

src/main.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
import { enableProdMode } from '@angular/core';
2-
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
32

4-
import { AppModule } from './app/app.module';
53
import { environment } from './environments/environment';
4+
import { AppComponent } from './app/app.component';
5+
import { bootstrapApplication } from '@angular/platform-browser';
6+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
7+
import { ActivatedRoute, provideRouter, Router, withComponentInputBinding } from '@angular/router';
68

79
if (environment.production) {
810
enableProdMode();
911
}
1012

11-
platformBrowserDynamic().bootstrapModule(AppModule)
12-
.catch(err => console.error(err));
13+
bootstrapApplication(AppComponent, {
14+
providers: [
15+
provideRouter([], withComponentInputBinding()),
16+
provideHttpClient(withInterceptorsFromDi())
17+
],
18+
});

0 commit comments

Comments
 (0)