Skip to content

Commit f323718

Browse files
committed
upgrade to Angular 8 and Node 12
1 parent 66757c0 commit f323718

13 files changed

+44
-25
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'.

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.module.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ import { HomeComponent } from './home/home.component';
1212
import {MatTabsModule} from '@angular/material/tabs';
1313
import { CoursesCardListComponent } from './courses-card-list/courses-card-list.component';
1414
import {CourseComponent} from "./course/course.component";
15-
import {
16-
MatDatepickerModule,
17-
MatDialogModule,
18-
MatInputModule, MatListModule, MatPaginatorModule, MatProgressSpinnerModule, MatSelectModule, MatSidenavModule,
19-
MatSortModule,
20-
MatTableModule,
21-
MatToolbarModule
22-
} from "@angular/material";
15+
import { MatDatepickerModule } from "@angular/material/datepicker";
16+
import { MatDialogModule } from "@angular/material/dialog";
17+
import { MatInputModule } from "@angular/material/input";
18+
import { MatListModule } from "@angular/material/list";
19+
import { MatPaginatorModule } from "@angular/material/paginator";
20+
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
21+
import { MatSelectModule } from "@angular/material/select";
22+
import { MatSidenavModule } from "@angular/material/sidenav";
23+
import { MatSortModule } from "@angular/material/sort";
24+
import { MatTableModule } from "@angular/material/table";
25+
import { MatToolbarModule } from "@angular/material/toolbar";
2326
import {CoursesService} from "./services/courses.service";
2427
import {CourseResolver} from "./services/course.resolver";
2528
import { CourseDialogComponent } from './course-dialog/course-dialog.component';

src/app/course-dialog/course-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, Inject, OnInit, ViewEncapsulation} from '@angular/core';
2-
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material";
2+
import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
33
import {Course} from "../model/course";
44
import {FormBuilder, Validators, FormGroup} from "@angular/forms";
55
import * as moment from 'moment';

src/app/course/course.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
22
import {ActivatedRoute} from '@angular/router';
3-
import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
3+
import { MatPaginator } from '@angular/material/paginator';
4+
import { MatSort } from '@angular/material/sort';
5+
import { MatTableDataSource } from '@angular/material/table';
46
import {Course} from '../model/course';
57
import {CoursesService} from '../services/courses.service';
68
import {debounceTime, distinctUntilChanged, startWith, tap, delay} from 'rxjs/operators';
7-
import {merge} from 'rxjs/observable/merge';
8-
import {fromEvent} from 'rxjs/observable/fromEvent';
9+
import {merge, fromEvent} from 'rxjs';
910
import {Lesson} from '../model/lesson';
1011
import {Meta, Title} from '@angular/platform-browser';
1112

src/app/courses-card-list/courses-card-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, Input, OnInit, ViewEncapsulation} from '@angular/core';
22
import {Course} from "../model/course";
3-
import {MatDialog, MatDialogConfig} from "@angular/material";
3+
import { MatDialog, MatDialogConfig } from "@angular/material/dialog";
44
import {CourseDialogComponent} from "../course-dialog/course-dialog.component";
55

66
@Component({

src/app/home/home.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, OnInit} from '@angular/core';
22
import {Course} from "../model/course";
3-
import {Observable} from "rxjs/Observable";
3+
import {Observable} from "rxjs";
44
import {CoursesService} from "../services/courses.service";
55
import {map, tap} from 'rxjs/operators';
66

src/app/services/course.resolver.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import {Inject, Injectable, PLATFORM_ID} from '@angular/core';
22
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
33
import {Course} from '../model/course';
4-
import {Observable} from 'rxjs/Observable';
4+
import {Observable, of} from 'rxjs';
55
import {CoursesService} from './courses.service';
66
import {first, tap} from 'rxjs/operators';
7-
import {of} from 'rxjs/observable/of';
87
import {isPlatformServer} from '@angular/common';
98
import {makeStateKey, TransferState} from '@angular/platform-browser';
109

src/app/services/courses.service.ts

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

33
import {Injectable} from "@angular/core";
44
import {HttpClient} from "@angular/common/http";
5-
import {Observable} from "rxjs/Observable";
5+
import {Observable} from "rxjs";
66
import {Course} from "../model/course";
77
import {Lesson} from "../model/lesson";
88
import {map} from 'rxjs/operators';

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)