Merge pull request #164 from damienbod/dev-update

Dev update
damienbod · Sep 15, 2020 · 23a367c · 23a367c
2 parents 5fd130d + 745aadd
commit 23a367c
Show file tree

Hide file tree

Showing 7 changed files with 2,707 additions and 2,354 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ For a fresh start, consider running these commands
 
 <a href="https://github.com/damienbod/Angular2WebpackVisualStudio/blob/master/README.md">Readme</a>
 
+<a name="2020-09-15"></a>
+# 2020-06-26 Version 7.0.1
+* Update to Angular 10.1.1
+* 
+
 <a name="2020-06-26"></a>
 # 2020-06-26 Version 7.0.0
 * Update to Angular 10.0.0

diff --git a/src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj b/src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj
@@ -5,7 +5,7 @@
     <TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />

diff --git a/src/AngularWebpackVisualStudio/Controllers/ThingsController.cs b/src/AngularWebpackVisualStudio/Controllers/ThingsController.cs
@@ -99,7 +99,7 @@ public IActionResult Remove(int id)
 
         [HttpPut]
         [Route("{id:int}")]
-        public IActionResult Update(int id, [FromBody]Thing thing)
+        public IActionResult Update(int id, [FromBody] Thing thing)
         {
             var thingToCheck = _thingsRepository.GetSingle(id);
 

diff --git a/src/AngularWebpackVisualStudio/karma.conf.js b/src/AngularWebpackVisualStudio/karma.conf.js
@@ -3,6 +3,9 @@
 module.exports = function (config) {
     var webpackConfig = require('./config/webpack.test.js');
 
+	var process = require('process');
+	process.env.CHROME_BIN = require('puppeteer').executablePath();
+
     var configuration = {
 
         // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -64,11 +67,16 @@ module.exports = function (config) {
 
         // start these browsers
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        browsers: ['Chrome'],
+        browsers: ['Chrome', 'ChromeHeadless'],
+		browserDisconnectTimeout: 10000,
+		browserDisconnectTolerance: 3,
+		browserNoActivityTimeout: 60000,
+		flags: [
+		  '--disable-web-security',
+		  '--disable-gpu',
+		  '--no-sandbox'
+		]
 
-        // Continuous Integration mode
-        // if true, Karma captures browsers, runs the tests and exits
-        singleRun: false
 
     };
 

diff --git a/src/AngularWebpackVisualStudio/package-lock.json b/src/AngularWebpackVisualStudio/package-lock.json
diff --git a/src/AngularWebpackVisualStudio/package.json b/src/AngularWebpackVisualStudio/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-webpack-visualstudio",
-    "version": "7.0.0",
+    "version": "7.0.1",
     "description": "An Angular VS template",
     "main": "wwwroot/index.html",
     "author": "",
@@ -24,70 +24,72 @@
         "lint": "eslint . --ext .ts"
     },
     "dependencies": {
-        "@angular/animations": "~10.0.0",
-        "@angular/common": "~10.0.0",
-        "@angular/compiler": "~10.0.0",
-        "@angular/core": "~10.0.0",
-        "@angular/forms": "~10.0.0",
-        "@angular/platform-browser": "~10.0.0",
-        "@angular/platform-browser-dynamic": "~10.0.0",
-        "@angular/router": "~10.0.0",
-        "@popperjs/core": "^2.4.2",
-        "bootstrap": "4.5.0",
+        "@angular/animations": "~10.1.1",
+        "@angular/common": "~10.1.1",
+        "@angular/compiler": "~10.1.1",
+        "@angular/core": "~10.1.1",
+        "@angular/forms": "~10.1.1",
+        "@angular/platform-browser": "~10.1.1",
+        "@angular/platform-browser-dynamic": "~10.1.1",
+        "@angular/router": "~10.1.1",
+        "@popperjs/core": "^2.4.4",
+        "bootstrap": "4.5.2",
         "core-js": "^2.6.5",
         "ie-shim": "0.1.0",
-        "rxjs": "~6.5.5",
-        "rxjs-compat": "^6.5.5",
-        "zone.js": "~0.10.3"
+        "rxjs": "~6.6.3",
+        "rxjs-compat": "^6.6.3",
+        "tslint": "^6.1.3",
+        "zone.js": "^0.10.3"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^0.1000.0",
-        "@angular/cli": "~10.0.0",
-        "@angular/compiler-cli": "~10.0.0",
-        "@angular/language-service": "~10.0.0",
-        "@ngtools/webpack": "^10.0.0",
-        "@types/jasmine": "~3.5.11",
+        "@angular-devkit/build-angular": "^0.1001.1",
+        "@angular/cli": "~10.1.1",
+        "@angular/compiler-cli": "~10.1.1",
+        "@angular/language-service": "~10.1.1",
+        "@ngtools/webpack": "^10.1.1",
+        "@types/jasmine": "~3.5.14",
         "@types/jasminewd2": "~2.0.8",
-        "@types/node": "~14.0.14",
+        "@types/node": "~14.10.1",
+        "@typescript-eslint/eslint-plugin": "^4.1.1",
+        "@typescript-eslint/eslint-plugin-tslint": "^4.1.1",
+        "@typescript-eslint/parser": "^4.1.1",
         "angular-router-loader": "0.8.5",
         "angular2-template-loader": "^0.6.2",
         "awesome-typescript-loader": "^5.2.1",
         "clean-webpack-plugin": "2.0.2",
-        "codelyzer": "~5.2.2",
-        "concurrently": "^5.2.0",
+        "codelyzer": "~6.0.0",
+        "concurrently": "^5.3.0",
         "copy-webpack-plugin": "^5.1.1",
         "css-loader": "^3.4.2",
+        "eslint": "^7.9.0",
         "file-loader": "^3.0.1",
         "html-webpack-plugin": "^3.2.0",
-        "eslint": "^7.3.1",
-        "jasmine-core": "~3.5.0",
+        "jasmine-core": "~3.6.0",
         "jasmine-spec-reporter": "~5.0.2",
         "jquery": "^3.5.1",
         "json-loader": "^0.5.7",
-        "karma": "~5.1.0",
+        "karma": "~5.2.2",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~3.0.3",
-        "karma-jasmine": "~3.3.1",
+        "karma-jasmine": "~4.0.1",
         "karma-jasmine-html-reporter": "^1.5.4",
-        "karma-sourcemap-loader": "^0.3.7",
+        "karma-sourcemap-loader": "^0.3.8",
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "4.0.2",
-        "protractor": "~6.0.0",
-        "raw-loader": "^1.0.0",
         "node-sass": "^4.14.1",
-        "sass-loader": "^8.0.2",
+        "protractor": "^7.0.0",
+        "puppeteer": "^5.3.0",
+        "raw-loader": "^1.0.0",
         "rimraf": "^3.0.2",
+        "sass-loader": "^8.0.2",
         "source-map-loader": "^0.2.4",
         "style-loader": "^1.1.3",
         "toposort": "2.0.2",
-        "url-loader": "^1.1.2",
-        "ts-node": "~8.10.2",
-        "@typescript-eslint/eslint-plugin-tslint": "^3.4.0",
-        "@typescript-eslint/eslint-plugin": "^3.4.0",
-        "@typescript-eslint/parser": "^3.4.0",
+        "ts-node": "~9.0.0",
+        "typescript": "~4.0.2",
         "uglifyjs-webpack-plugin": "^2.2.0",
-        "typescript": "~3.9.5",
-        "webpack": "^4.43.0",
+        "url-loader": "^1.1.2",
+        "webpack": "^4.44.1",
         "webpack-bundle-analyzer": "^3.8.0",
         "webpack-cli": "3.3.12",
         "webpack-dev-server": "^3.11.0",

diff --git a/tests/AngularWebpackVisualStudio_Tests/AngularWebpackVisualStudio_Tests.csproj b/tests/AngularWebpackVisualStudio_Tests/AngularWebpackVisualStudio_Tests.csproj
@@ -5,15 +5,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.8" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.8" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>