Skip to content

Commit 24f8026

Browse files
committed
Upgrade to Angular 16
1 parent 2b7c155 commit 24f8026

File tree

7 files changed

+6376
-6820
lines changed

7 files changed

+6376
-6820
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
This repository contains the code of the [Angular Testing Course](https://angular-university.io/course/angular-testing-course).
55

6-
This course repository is updated to Angular v15, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
6+
This course repository is updated to Angular v16, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
77

88
![Angular Testing Course](https://s3-us-west-1.amazonaws.com/angular-university/course-images/angular-testing-small.png)
99

package-lock.json

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

package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
},
1919
"private": true,
2020
"dependencies": {
21-
"@angular/animations": "15.0.2",
22-
"@angular/cdk": "^15.0.1",
23-
"@angular/common": "15.0.2",
24-
"@angular/compiler": "15.0.2",
25-
"@angular/core": "15.0.2",
26-
"@angular/forms": "15.0.2",
27-
"@angular/material": "^15.0.1",
28-
"@angular/material-moment-adapter": "15.0.1",
29-
"@angular/platform-browser": "15.0.2",
30-
"@angular/platform-browser-dynamic": "15.0.2",
31-
"@angular/router": "15.0.2",
21+
"@angular/animations": "16.0.0",
22+
"@angular/cdk": "^16.0.0",
23+
"@angular/common": "16.0.0",
24+
"@angular/compiler": "16.0.0",
25+
"@angular/core": "16.0.0",
26+
"@angular/forms": "16.0.0",
27+
"@angular/material": "^16.0.0",
28+
"@angular/material-moment-adapter": "16.0.0",
29+
"@angular/platform-browser": "16.0.0",
30+
"@angular/platform-browser-dynamic": "16.0.0",
31+
"@angular/router": "16.0.0",
3232
"body-parser": "^1.18.3",
3333
"core-js": "^3.19.0",
3434
"cors": "^2.8.5",
@@ -39,13 +39,13 @@
3939
"npm-run-all": "^4.1.5",
4040
"rxjs": "6.5.4",
4141
"tslib": "^2.0.0",
42-
"zone.js": "~0.11.4"
42+
"zone.js": "~0.13.0"
4343
},
4444
"devDependencies": {
45-
"@angular-devkit/build-angular": "^15.0.1",
46-
"@angular/cli": "^15.0.1",
47-
"@angular/compiler-cli": "15.0.2",
48-
"@angular/language-service": "15.0.2",
45+
"@angular-devkit/build-angular": "^16.0.0",
46+
"@angular/cli": "^16.0.0",
47+
"@angular/compiler-cli": "16.0.0",
48+
"@angular/language-service": "16.0.0",
4949
"@cypress/webpack-preprocessor": "^4.0.3",
5050
"@types/express": "^4.0.39",
5151
"@types/jasmine": "~4.3.0",
@@ -56,13 +56,12 @@
5656
"karma": "~6.4.0",
5757
"karma-chrome-launcher": "~3.1.0",
5858
"karma-cli": "~1.0.1",
59-
"karma-coverage-istanbul-reporter": "~3.0.2",
6059
"karma-coverage": "~2.2.0",
60+
"karma-coverage-istanbul-reporter": "~3.0.2",
6161
"karma-jasmine": "~5.1.0",
6262
"karma-jasmine-html-reporter": "~2.0.0",
63-
"protractor": "~7.0.0",
6463
"start-server-and-test": "^1.9.1",
6564
"ts-node": "~3.2.0",
66-
"typescript": "~4.8.2"
65+
"typescript": "~5.0.4"
6766
}
6867
}

src/app/app-routing.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
33
import {HomeComponent} from "./courses/home/home.component";
44
import {AboutComponent} from "./about/about.component";
55
import {CourseComponent} from "./courses/course/course.component";
6-
import {CourseResolver} from "./courses/services/course.resolver";
6+
import {courseResolver} from "./courses/services/course.resolver";
77

88
const routes: Routes = [
99
{
@@ -19,7 +19,7 @@ const routes: Routes = [
1919
path: 'courses/:id',
2020
component: CourseComponent,
2121
resolve: {
22-
course: CourseResolver
22+
course: courseResolver
2323
}
2424
},
2525
{

src/app/app.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { MatTableModule } from "@angular/material/table";
2626
import { MatToolbarModule } from "@angular/material/toolbar";
2727
import {CoursesService} from "./courses/services/courses.service";
2828
import {HttpClientModule} from "@angular/common/http";
29-
import {CourseResolver} from "./courses/services/course.resolver";
3029
import { CourseDialogComponent } from './courses/course-dialog/course-dialog.component';
3130
import {ReactiveFormsModule} from "@angular/forms";
3231
import {MatMomentDateModule} from "@angular/material-moment-adapter";

src/app/courses/courses.module.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {AppRoutingModule} from '../app-routing.module';
2727
import {MatMomentDateModule} from '@angular/material-moment-adapter';
2828
import {ReactiveFormsModule} from '@angular/forms';
2929
import {CoursesService} from './services/courses.service';
30-
import {CourseResolver} from './services/course.resolver';
30+
import {courseResolver} from './services/course.resolver';
3131

3232
@NgModule({
3333
declarations: [
@@ -67,8 +67,7 @@ import {CourseResolver} from './services/course.resolver';
6767
CourseDialogComponent
6868
],
6969
providers: [
70-
CoursesService,
71-
CourseResolver
70+
CoursesService
7271
]
7372
})export class CoursesModule {
7473

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
1-
2-
3-
4-
import {Injectable} from "@angular/core";
5-
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from "@angular/router";
1+
import {inject} from '@angular/core';
2+
import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
63
import {Course} from "../model/course";
74
import {Observable} from "rxjs";
85
import {CoursesService} from "./courses.service";
96

107

8+
export function courseResolver(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
119

12-
@Injectable()
13-
export class CourseResolver implements Resolve<Course> {
10+
const coursesService = inject(CoursesService);
1411

15-
constructor(private coursesService:CoursesService) {
16-
17-
}
18-
19-
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
20-
return this.coursesService.findCourseById(route.params['id']);
21-
}
12+
return coursesService.findCourseById(route.params['id']);
2213

2314
}
24-

0 commit comments

Comments
 (0)