Skip to content

Commit c6a6652

Browse files
aboudardaboudard
committed
fix: update angular 14
1 parent a2b0a60 commit c6a6652

File tree

8 files changed

+2847
-3669
lines changed

8 files changed

+2847
-3669
lines changed

‎src/angular/angular.json

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
}
108108
}
109109
},
110-
"defaultProject": "ngrxdata",
111110
"schematics": {
112111
"@schematics/angular:component": {
113112
"prefix": "app",

‎src/angular/package-lock.json

+2,797-3,613
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular/package.json

+33-32
Original file line numberDiff line numberDiff line change
@@ -15,51 +15,52 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@angular/animations": "^13.3.11",
19-
"@angular/common": "^13.3.11",
20-
"@angular/compiler": "^13.3.11",
21-
"@angular/core": "^13.3.11",
22-
"@angular/forms": "^13.3.11",
23-
"@angular/localize": "^13.3.11",
24-
"@angular/platform-browser": "^13.3.11",
25-
"@angular/platform-browser-dynamic": "^13.3.11",
26-
"@angular/router": "^13.3.11",
27-
"@fortawesome/angular-fontawesome": "^0.9.0",
18+
"@angular/animations": "^14.2.12",
19+
"@angular/common": "^14.2.12",
20+
"@angular/compiler": "^14.2.12",
21+
"@angular/core": "^14.2.12",
22+
"@angular/forms": "^14.2.12",
23+
"@angular/localize": "^14.2.12",
24+
"@angular/platform-browser": "^14.2.12",
25+
"@angular/platform-browser-dynamic": "^14.2.12",
26+
"@angular/router": "^14.2.12",
27+
"@fortawesome/angular-fontawesome": "^0.11.1",
2828
"@fortawesome/fontawesome-svg-core": "^6.1.1",
2929
"@fortawesome/free-solid-svg-icons": "^6.1.0",
30-
"@ng-bootstrap/ng-bootstrap": "^10.0.0",
31-
"@ngrx/data": "^13.2.0",
32-
"@ngrx/effects": "^13.2.0",
33-
"@ngrx/entity": "^13.2.0",
34-
"@ngrx/store": "^13.2.0",
35-
"@ngrx/store-devtools": "^13.2.0",
36-
"bootstrap": "^4.5.0",
30+
"@ng-bootstrap/ng-bootstrap": "^13.1.1",
31+
"@ngrx/data": "^14.3.2",
32+
"@ngrx/effects": "^14.3.2",
33+
"@ngrx/entity": "^14.3.2",
34+
"@ngrx/store": "^14.3.2",
35+
"@ngrx/store-devtools": "^14.3.2",
36+
"@popperjs/core": "^2.10.2",
37+
"bootstrap": "^5.2.0",
3738
"core-js": "^2.6.11",
38-
"ngx-spinner": "^12.0.0",
39-
"ngx-toastr": "^14.3.0",
39+
"ngx-spinner": "^13.1.1",
40+
"ngx-toastr": "^15.2.2",
4041
"rxjs": "^6.6.3",
4142
"rxjs-compat": "^6.5.4",
4243
"tslib": "^2.0.0",
4344
"zone.js": "~0.11.4"
4445
},
4546
"devDependencies": {
46-
"@angular-devkit/build-angular": "~13.3.9",
47-
"@angular-eslint/builder": "^12.0.0",
48-
"@angular-eslint/eslint-plugin": "^12.0.0",
49-
"@angular-eslint/eslint-plugin-template": "^12.0.0",
50-
"@angular-eslint/schematics": "12.7.0",
51-
"@angular-eslint/template-parser": "^12.0.0",
52-
"@angular/cli": "~13.3.9",
53-
"@angular/compiler-cli": "^13.3.11",
54-
"@angular/language-service": "^13.3.11",
55-
"@ngrx/schematics": "^13.2.0",
47+
"@angular-devkit/build-angular": "^14.2.10",
48+
"@angular-eslint/builder": "^14.4.0",
49+
"@angular-eslint/eslint-plugin": "^14.4.0",
50+
"@angular-eslint/eslint-plugin-template": "^14.4.0",
51+
"@angular-eslint/schematics": "14.4.0",
52+
"@angular-eslint/template-parser": "^14.4.0",
53+
"@angular/cli": "^14.2.10",
54+
"@angular/compiler-cli": "^14.2.12",
55+
"@angular/language-service": "^14.2.12",
56+
"@ngrx/schematics": "^14.3.2",
5657
"@types/jasmine": "~3.6.0",
5758
"@types/jasminewd2": "~2.0.3",
5859
"@types/node": "^12.11.1",
59-
"@typescript-eslint/eslint-plugin": "4.28.2",
60-
"@typescript-eslint/parser": "4.28.2",
60+
"@typescript-eslint/eslint-plugin": "^5.36.2",
61+
"@typescript-eslint/parser": "^5.36.2",
6162
"codelyzer": "^6.0.0",
62-
"eslint": "^7.26.0",
63+
"eslint": "^8.23.0",
6364
"jasmine-core": "~3.6.0",
6465
"jasmine-spec-reporter": "~5.0.0",
6566
"json-server": "^0.15.1",

‎src/angular/server.json

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
"title": "PHP pour mon chat",
3636
"id": 5
3737
},
38-
{
39-
"title": "That's barealy a Todo List right ?",
40-
"description": "the brand new description",
41-
"active": false,
42-
"id": 7
43-
},
4438
{
4539
"description": "ititit ititit it it it it it ititit itit ",
4640
"title": "Do something about it",

‎src/angular/src/app/comp/fa-input/fa-input.component.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '~bootstrap/scss/functions';
1+
@import '../../../../node_modules/bootstrap/scss/functions';
22
@import "../../../assets/variables.scss";
3-
@import "~bootstrap/scss/variables";
3+
@import "../../../../node_modules/bootstrap/scss/variables";
44

55
:host ::ng-deep input {
66
border: none;

‎src/angular/src/app/files/upload/upload.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
2-
import { FormControl, FormGroup, Validators } from '@angular/forms';
2+
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
33
import { ToastrService } from 'ngx-toastr';
44
import { FilesService } from '../../services/files.service';
55

@@ -10,7 +10,7 @@ import { FilesService } from '../../services/files.service';
1010
})
1111
export class UploadComponent implements OnInit {
1212
fileToUpload: File = null;
13-
uploadForm: FormGroup;
13+
uploadForm: UntypedFormGroup;
1414

1515
constructor(
1616
private cd: ChangeDetectorRef,
@@ -20,8 +20,8 @@ export class UploadComponent implements OnInit {
2020
}
2121

2222
ngOnInit() {
23-
this.uploadForm = new FormGroup({
24-
fileUpload: new FormControl('', Validators.required)
23+
this.uploadForm = new UntypedFormGroup({
24+
fileUpload: new UntypedFormControl('', Validators.required)
2525
});
2626
}
2727

‎src/angular/src/app/todo/todo-edit/todo-edit.component.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { map, shareReplay, takeUntil } from 'rxjs/operators';
44
import { combineLatest, Observable, Subject } from 'rxjs';
55
import { TodosService } from '../../services/todos.service';
66
import { Todo } from '../../dto/todo';
7-
import { FormControl, FormGroup } from '@angular/forms';
7+
import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
88
import { Location } from '@angular/common';
99

1010
@Component({
@@ -15,7 +15,7 @@ import { Location } from '@angular/common';
1515
export class TodoEditComponent implements OnInit, OnDestroy {
1616
id$: Observable<any>;
1717
todo$: Observable<Todo>;
18-
todoForm: FormGroup;
18+
todoForm: UntypedFormGroup;
1919
destroy$ = new Subject();
2020

2121
constructor(
@@ -26,7 +26,7 @@ export class TodoEditComponent implements OnInit, OnDestroy {
2626
) {
2727
}
2828

29-
validateForm(formGroup: FormGroup) {
29+
validateForm(formGroup: UntypedFormGroup) {
3030
if (formGroup.get('title').value === '' && formGroup.get('description').value === '') {
3131
return {
3232
validateForm: {
@@ -59,13 +59,13 @@ export class TodoEditComponent implements OnInit, OnDestroy {
5959
shareReplay(1)
6060
);
6161

62-
this.todoForm = new FormGroup({
63-
title: new FormControl(),
64-
description: new FormControl(),
65-
active: new FormControl(),
66-
dateTodo: new FormControl(),
67-
id: new FormControl()
68-
}, (formGroup: FormGroup) => {
62+
this.todoForm = new UntypedFormGroup({
63+
title: new UntypedFormControl(),
64+
description: new UntypedFormControl(),
65+
active: new UntypedFormControl(),
66+
dateTodo: new UntypedFormControl(),
67+
id: new UntypedFormControl()
68+
}, (formGroup: UntypedFormGroup) => {
6969
return this.validateForm(formGroup);
7070
});
7171

‎src/angular/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
12-
"target": "es2015",
12+
"target": "es2020",
1313
"typeRoots": [
1414
"node_modules/@types"
1515
],

0 commit comments

Comments
 (0)