Merge pull request #157 from damienbod/dev_angular_9

Move to Angular 9

Author: damienbod

CHANGELOG.md

@@ -5,6 +5,13 @@ For a fresh start, consider running these commands
 
 <a href="https://github.com/damienbod/Angular2WebpackVisualStudio/blob/master/README.md">Readme</a>
 
+<a name="2020-02-10"></a>
+# 2020-01-10 Version 6.0.0
+* Update to Angular 9
+* Update .NET Core 3.1.1
+* Move to eslint
+
+
 <a name="2020-01-02"></a>
 # 2020-01-02 Version 5.0.26
 * npm audit fix

src/AngularWebpackVisualStudio/.eslintignore

@@ -0,0 +1,9 @@
+# don't ever lint node_modules
+node_modules
+# don't lint build output (make sure it's set to your correct build folder name)
+.template.config
+# don't lint nyc coverage output
+bin
+obj
+wwwroot
+config

src/AngularWebpackVisualStudio/.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+      project: ['./tsconfig.json', './tsconfig-aot.json'],
+  },
+  plugins: [
+    '@typescript-eslint',
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+	'plugin:@typescript-eslint/recommended-requiring-type-checking',
+  ],
+};

src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj

@@ -2,10 +2,10 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>5.0.26</Version>
-    <TypeScriptToolsVersion>3.4</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />

src/AngularWebpackVisualStudio/angularApp/app/core/services/thing-data.service.ts

@@ -34,12 +34,12 @@ export class ThingService {
         return this.http.post<Thing>(this.actionUrl, toAdd, { headers: this.headers });
     }
 
-    update(id: number, itemToUpdate: any): Observable<Thing> {
+    update(id: number, itemToUpdate: Thing): Observable<Thing> {
         return this.http
             .put<Thing>(this.actionUrl + id, JSON.stringify(itemToUpdate), { headers: this.headers });
     }
 
-    delete(id: number): Observable<any> {
-        return this.http.delete<any>(this.actionUrl + id, { headers: this.headers });
+    delete(id: number): Observable<Thing> {
+        return this.http.delete<Thing>(this.actionUrl + id, { headers: this.headers });
     }
 }

src/AngularWebpackVisualStudio/angularApp/app/home/components/home.component.ts

@@ -16,11 +16,11 @@ export class HomeComponent implements OnInit {
     this.message = 'Things from the ASP.NET Core API';
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.getAllThings();
   }
 
-  addThing() {
+  addThing(): void {
     this.dataService.add(this.thing).subscribe(
       () => {
         this.getAllThings();
@@ -32,7 +32,7 @@ export class HomeComponent implements OnInit {
     );
   }
 
-  deleteThing(thing: Thing) {
+  deleteThing(thing: Thing): void {
     this.dataService.delete(thing.id).subscribe(
       () => {
         this.getAllThings();
@@ -43,7 +43,7 @@ export class HomeComponent implements OnInit {
     );
   }
 
-  private getAllThings() {
+  private getAllThings(): void {
     this.dataService
       .getAll()
       .subscribe(

src/AngularWebpackVisualStudio/angularApp/main-aot.ts

@@ -1,10 +1,19 @@
-import './styles.scss';
-
+/* eslint-disable */
+import './styles.scss';
 import 'zone.js';
-import { platformBrowser } from '@angular/platform-browser';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+// import { platformBrowser } from '@angular/platform-browser';
 import { enableProdMode } from '@angular/core';
-import { AppModuleNgFactory } from './app/app.module.ngfactory';
+import { AppModule } from './app/app.module';
 
 enableProdMode();
 
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
+// Styles.
+// Enables Hot Module Replacement.
+declare var module: any;
+
+if (module.hot) {
+    module.hot.accept();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);

src/AngularWebpackVisualStudio/angularApp/main.ts

@@ -1,4 +1,5 @@
-import './styles.scss';
+/* eslint-disable */
+import './styles.scss';
 import 'zone.js';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 // import { platformBrowser } from '@angular/platform-browser';

src/AngularWebpackVisualStudio/angularApp/tests/components/home.component.spec.ts

@@ -1,4 +1,5 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+/* eslint-disable */
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 

src/AngularWebpackVisualStudio/config/webpack.dev.js

@@ -55,8 +55,7 @@ module.exports = {
           'awesome-typescript-loader',
           'angular-router-loader',
           'angular2-template-loader',
-          'source-map-loader',
-          'tslint-loader'
+          'source-map-loader'
         ]
       },
       {