Skip to content

Commit ce69d0e

Browse files
committed
upgrade to Angular 8 and Node 12
1 parent 0ef2f52 commit ce69d0e

12 files changed

+3546
-9279
lines changed

browserslist

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# You can see what browsers were selected by your queries by running:
6+
# npx browserslist
7+
8+
> 0.5%
9+
last 2 versions
10+
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

package-lock.json

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

package.json

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",
7-
"start": "ng serve --proxy-config ./proxy.json",
8-
"server": "./node_modules/.bin/ts-node ./server/server.ts",
7+
"start": "ng serve --proxy-config ./proxy.json --live-reload false",
8+
"server": "ts-node -P ./server/server.tsconfig.json ./server/server.ts",
99
"build": "ng build",
10+
"start:prod": "ng build --prod && cd dist && http-server -c-1 -P http://localhost:9000 .",
1011
"test": "ng test",
1112
"lint": "ng lint",
1213
"e2e": "ng e2e"
1314
},
1415
"private": true,
1516
"dependencies": {
16-
"@angular/animations": "^7.0.0",
17-
"@angular/common": "^7.0.0",
18-
"@angular/compiler": "^7.0.0",
19-
"@angular/core": "^7.0.0",
20-
"@angular/forms": "^7.0.0",
21-
"@angular/http": "^7.0.0",
22-
"@angular/platform-browser": "^7.0.0",
23-
"@angular/platform-browser-dynamic": "^7.0.0",
24-
"@angular/platform-server": "^7.0.0",
25-
"@angular/router": "^7.0.0",
26-
"@angular/service-worker": "^7.0.0",
17+
"@angular/animations": "^8.0.0",
18+
"@angular/common": "^8.0.0",
19+
"@angular/compiler": "^8.0.0",
20+
"@angular/core": "^8.0.0",
21+
"@angular/forms": "^8.0.0",
22+
"@angular/platform-browser": "^8.0.0",
23+
"@angular/platform-browser-dynamic": "^8.0.0",
24+
"@angular/platform-server": "^8.0.0",
25+
"@angular/router": "^8.0.0",
26+
"@angular/service-worker": "^8.0.0",
2727
"@types/express": "^4.0.36",
2828
"@types/lodash": "^4.14.70",
2929
"body-parser": "^1.17.2",
@@ -32,32 +32,31 @@
3232
"core-js": "^2.4.1",
3333
"http-server": "^0.10.0",
3434
"moment": "^2.18.1",
35-
"nodemon": "^1.11.0",
35+
"nodemon": "^1.19.1",
3636
"rxjs": "^6.3.3",
3737
"web-push": "^3.2.5",
38-
"zone.js": "^0.8.26",
39-
"rxjs-compat": "^6.0.0-rc.0"
38+
"zone.js": "~0.9.1"
4039
},
4140
"devDependencies": {
42-
"@angular/cli": "^7.0.1",
43-
"@angular/compiler-cli": "^7.0.0",
44-
"@angular/language-service": "^7.0.0",
41+
"@angular-devkit/build-angular": "~0.800.0",
42+
"@angular/cli": "^8.0.1",
43+
"@angular/compiler-cli": "^8.0.0",
44+
"@angular/language-service": "^8.0.0",
4545
"@types/jasmine": "~2.5.53",
4646
"@types/jasminewd2": "~2.0.2",
4747
"@types/node": "~6.0.60",
48-
"codelyzer": "~4.2.0",
48+
"codelyzer": "^5.0.1",
4949
"jasmine-core": "~2.6.2",
5050
"jasmine-spec-reporter": "~4.1.0",
51-
"karma": "~1.7.0",
51+
"karma": "^4.1.0",
5252
"karma-chrome-launcher": "~2.1.1",
5353
"karma-cli": "~1.0.1",
5454
"karma-coverage-istanbul-reporter": "^1.2.1",
5555
"karma-jasmine": "~1.1.0",
5656
"karma-jasmine-html-reporter": "^0.2.2",
57-
"protractor": "~5.1.2",
57+
"protractor": "^6.0.0",
5858
"ts-node": "~3.2.0",
5959
"tslint": "~5.7.0",
60-
"typescript": "~3.1.3",
61-
"@angular-devkit/build-angular": "~0.10.0"
60+
"typescript": "~3.4.5"
6261
}
6362
}

server/server.tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"compilerOptions": {
3+
"module": "commonjs",
4+
"lib": ["es2017"]
5+
}
6+
}

src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, OnInit} from '@angular/core';
2-
import {Observable} from "rxjs/Observable";
2+
import {Observable} from "rxjs";
33

44
@Component({
55
selector: 'app-root',

src/app/app.module.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {BrowserModule} from '@angular/platform-browser';
2-
import {NgModule, Provider} from '@angular/core';
3-
import {HttpClientModule, HttpClientXsrfModule} from '@angular/common/http';
2+
import {NgModule} from '@angular/core';
3+
import {HttpClientModule} from '@angular/common/http';
44

55
import {AppComponent} from './app.component';
66
import {LessonsComponent} from './lessons/lessons.component';
@@ -9,17 +9,19 @@ import {routesConfig} from "./routes.config";
99
import {LessonsService} from "./services/lessons.service";
1010
import {ReactiveFormsModule} from "@angular/forms";
1111

12-
import {Router, RouterModule} from "@angular/router";
12+
import {environment} from '../environments/environment';
13+
import {ServiceWorkerModule} from '@angular/service-worker';
1314

1415

15-
import 'rxjs/add/operator/switchMap';
16-
import 'rxjs/add/operator/map';
17-
import 'rxjs/add/operator/shareReplay';
18-
import 'rxjs/add/operator/do';
19-
import 'rxjs/add/operator/filter';
20-
import 'rxjs/add/operator/catch';
21-
import 'rxjs/add/operator/first';
22-
import 'rxjs/add/observable/of';
16+
17+
18+
19+
20+
21+
22+
23+
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
24+
import {RouterModule} from '@angular/router';
2325

2426

2527

src/app/lessons/lessons.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import {Component, OnInit} from '@angular/core';
22
import {LessonsService} from "../services/lessons.service";
3-
import {Observable} from "rxjs/Observable";
3+
import {Observable, of} from 'rxjs';
44
import {Lesson} from "../model/lesson";
5+
import {SwPush} from "@angular/service-worker";
6+
import {catchError} from 'rxjs/operators';
57

68
@Component({
79
selector: 'lessons',
@@ -23,7 +25,7 @@ export class LessonsComponent implements OnInit {
2325

2426

2527
loadLessons() {
26-
this.lessons$ = this.lessonsService.loadAllLessons().catch(err => Observable.of([]));
28+
this.lessons$ = this.lessonsService.loadAllLessons().pipe(catchError(err => of([])));
2729
}
2830

2931
}

src/app/services/lessons.service.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import {Injectable} from "@angular/core";
33
import {HttpClient} from "@angular/common/http";
44
import {Lesson} from "../model/lesson";
5-
import {Observable} from "rxjs/Observable";
5+
import {Observable} from "rxjs";
6+
import {map} from 'rxjs/operators';
67

78

89
@Injectable()
@@ -14,7 +15,9 @@ export class LessonsService {
1415

1516
loadAllLessons() : Observable<Lesson[]> {
1617
return this.http.get<any>('/api/lessons')
17-
.map(res => res.lessons);
18+
.pipe(
19+
map(res => res.lessons)
20+
)
1821
}
1922

2023
findLessonById(id:number) {

src/tsconfig.app.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"baseUrl": "./",
6-
"module": "es2015",
76
"types": []
87
},
98
"exclude": [

src/tsconfig.spec.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "./",
6-
"module": "commonjs",
7-
"target": "es5",
86
"types": [
97
"jasmine",
108
"node"

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"compileOnSave": false,
33
"compilerOptions": {
4+
"module": "esnext",
45
"outDir": "./dist/out-tsc",
56
"sourceMap": true,
67
"declaration": false,
78
"moduleResolution": "node",
89
"emitDecoratorMetadata": true,
910
"experimentalDecorators": true,
10-
"target": "es5",
11+
"target": "es2015",
1112
"typeRoots": [
1213
"node_modules/@types"
1314
],

tslint.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@
126126
"app",
127127
"kebab-case"
128128
],
129-
"use-input-property-decorator": true,
130-
"use-output-property-decorator": true,
131-
"use-host-property-decorator": true,
129+
"no-inputs-metadata-property": true,
130+
"no-outputs-metadata-property": true,
131+
"no-host-metadata-property": true,
132132
"no-input-rename": true,
133133
"no-output-rename": true,
134-
"use-life-cycle-interface": true,
134+
"use-lifecycle-interface": true,
135135
"use-pipe-transform-interface": true,
136136
"component-class-suffix": true,
137137
"directive-class-suffix": true,

0 commit comments

Comments
 (0)