Merge pull request #229 from TimeWarpEngineering/Cramer/2020-10-14/UpdateTypescriptProject

Update packages. And formatted all code

Author: StevenTCramer

.editorconfig

@@ -14,7 +14,7 @@ indent_style = space
 tab_width = 4
 
 # New line preferences
-end_of_line = crlf
+end_of_line = lf
 insert_final_newline = false
 
 # Development files

.gitignore

@@ -298,3 +298,5 @@ __pycache__/
 /source/AnyClone/
 /source/TypeSupport/
 /Source/BlazorState/wwwroot/blazorstate.js
+
+/StatiqDocs/output

BlazorState.sln

@@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.EndToEnd.TestCafe.T
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFD8811F-C0A5-42E0-AF4D-29D3620CBA7D}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
 		Build\BlazorStateMultiStage.yml = Build\BlazorStateMultiStage.yml
 		Directory.Build.props = Directory.Build.props
 		Build\documentation.yml = Build\documentation.yml

Build/BlazorStateMultiStage.yml

@@ -5,9 +5,9 @@ pr: none
 
 variables:
   Major: 3
-  Minor: 2
-  Patch: 4
-  DotNetSdkVersion: 3.1.302
+  Minor: 3
+  Patch: 0
+  DotNetSdkVersion: 3.1.402
 
 stages:
   - stage: Test_Stage

Directory.Build.props

@@ -37,12 +37,11 @@
     <SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
     <SystemConfigurationConfigurationManagerVersion>4.7.0</SystemConfigurationConfigurationManagerVersion>
 
-    <MicrosoftAspNetCoreVersion>3.1.6</MicrosoftAspNetCoreVersion>
-    <MicrosoftAspNetCoreComponentsWebVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreComponentsWebVersion>
-    <MicrosoftAspNetCoreMvcTestingVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreTestHostVersion>    
-    <MicrosoftExtensionsFileProvidersEmbeddedVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftExtensionsFileProvidersEmbeddedVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftAspNetCoreComponentsWebVersion>3.1.9</MicrosoftAspNetCoreComponentsWebVersion>
+    <MicrosoftAspNetCoreMvcTestingVersion>3.1.9</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>3.1.9</MicrosoftAspNetCoreTestHostVersion>    
+    <MicrosoftExtensionsFileProvidersEmbeddedVersion>3.1.9</MicrosoftExtensionsFileProvidersEmbeddedVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>3.1.9</MicrosoftExtensionsLoggingAbstractionsVersion>
 
     <MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
 
@@ -52,9 +51,9 @@
     <FixieVersion>2.2.1</FixieVersion>
     <FixieConsoleVersion>2.2.1</FixieConsoleVersion>
     <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
-    <MediatrExtensionsMicrosoftDependencyInjectionVersion>8.1.0</MediatrExtensionsMicrosoftDependencyInjectionVersion>
-    <MediatrVersion>8.1.0</MediatrVersion>
-    <ScrutorVersion>3.2.1</ScrutorVersion>
+    <MediatrExtensionsMicrosoftDependencyInjectionVersion>9.0.0</MediatrExtensionsMicrosoftDependencyInjectionVersion>
+    <MediatrVersion>9.0.0</MediatrVersion>
+    <ScrutorVersion>3.2.2</ScrutorVersion>
     <SeleniumSupportVersion>3.141.0</SeleniumSupportVersion>
     <SeleniumWebDriverVersion>3.141.0</SeleniumWebDriverVersion>
     <ShouldlyVersion>3.0.2</ShouldlyVersion>

Source/BlazorState.Js/package-lock.json

@@ -9,9 +9,9 @@
   },
   "devDependencies": {
     "@types/emscripten": "1.39.4",
-    "ts-loader": "8.0.2",
-    "typescript": "3.9.7",
-    "webpack": "4.44.1",
-    "webpack-cli": "3.3.12"
+    "ts-loader": "8.0.5",
+    "typescript": "4.0.3",
+    "webpack": "5.1.0",
+    "webpack-cli": "4.0.0"
   }
 }

Source/BlazorState.Js/package.json

@@ -1,7 +1,7 @@
-namespace BlazorState
+namespace BlazorState
 {
   using MediatR;
 
   public interface IAction : IRequest { }
 
-}
+}

Source/BlazorState/Base/Action.cs

@@ -1,19 +1,19 @@
-namespace BlazorState
-{
-  using System.Threading;
-  using System.Threading.Tasks;
-  using MediatR;
-
-  public abstract class ActionHandler<TAction> : IRequestHandler<TAction>
-  where TAction : IAction
-  {
-    public ActionHandler(IStore aStore)
-    {
-      Store = aStore;
-    }
-
-    protected IStore Store { get; set; }
-
-    public abstract Task<Unit> Handle(TAction aAction, CancellationToken aCancellationToken);
-  }
+namespace BlazorState
+{
+  using MediatR;
+  using System.Threading;
+  using System.Threading.Tasks;
+
+  public abstract class ActionHandler<TAction> : IRequestHandler<TAction>
+  where TAction : IAction
+  {
+    public ActionHandler(IStore aStore)
+    {
+      Store = aStore;
+    }
+
+    protected IStore Store { get; set; }
+
+    public abstract Task<Unit> Handle(TAction aAction, CancellationToken aCancellationToken);
+  }
 }

Source/BlazorState/Base/ActionHandler.cs

@@ -1,65 +1,65 @@
-namespace BlazorState
-{
-  using System;
-  using System.Collections.Concurrent;
-  using MediatR;
-  using Microsoft.AspNetCore.Components;
-
-  /// <summary>
-  /// A non required Base Class that injects Mediator and Store.
-  /// And exposes StateHasChanged
-  /// </summary>
-  /// <remarks>Implements IBlazorStateComponent by Injecting</remarks>
-  public class BlazorStateComponent : ComponentBase, IDisposable,
-     IBlazorStateComponent
-  {
-    static readonly ConcurrentDictionary<string, int> s_InstanceCounts = new ConcurrentDictionary<string, int>();
-
-    public BlazorStateComponent()
-    {
-      string name = GetType().Name;
-      int count = s_InstanceCounts.AddOrUpdate(name, 1, (aKey, aValue) => aValue + 1);
-
-      Id = $"{name}-{count}";
-    }
-
-    /// <summary>
-    /// A generated unique Id based on the Class name and number of times they have been created
-    /// </summary>
-    public string Id { get; }
-
-    /// <summary>
-    /// Allows for the Assigning of a value one can use to select an element during automated testing.
-    /// </summary>
-    [Parameter] public string TestId { get; set; }
-
-    [Inject] public IMediator Mediator { get; set; }
-    [Inject] public IStore Store { get; set; }
-
-    /// <summary>
-    /// Maintains all components that subscribe to a State.
-    /// Is updated by using the GetState method
-    /// </summary>
-    [Inject] public Subscriptions Subscriptions { get; set; }
-
-    /// <summary>
-    /// Exposes StateHasChanged
-    /// </summary>
-    public void ReRender() => base.InvokeAsync(StateHasChanged);
-
-    /// <summary>
-    /// Place a Subscription for the calling component
-    /// And returns the requested state
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    protected T GetState<T>()
-    {
-      Type stateType = typeof(T);
-      Subscriptions.Add(stateType, this);
-      return Store.GetState<T>();
-    }
-
-    public void Dispose() => Subscriptions.Remove(this);
-  }
+namespace BlazorState
+{
+  using MediatR;
+  using Microsoft.AspNetCore.Components;
+  using System;
+  using System.Collections.Concurrent;
+
+  /// <summary>
+  /// A non required Base Class that injects Mediator and Store.
+  /// And exposes StateHasChanged
+  /// </summary>
+  /// <remarks>Implements IBlazorStateComponent by Injecting</remarks>
+  public class BlazorStateComponent : ComponentBase, IDisposable,
+     IBlazorStateComponent
+  {
+    static readonly ConcurrentDictionary<string, int> s_InstanceCounts = new ConcurrentDictionary<string, int>();
+
+    public BlazorStateComponent()
+    {
+      string name = GetType().Name;
+      int count = s_InstanceCounts.AddOrUpdate(name, 1, (aKey, aValue) => aValue + 1);
+
+      Id = $"{name}-{count}";
+    }
+
+    /// <summary>
+    /// A generated unique Id based on the Class name and number of times they have been created
+    /// </summary>
+    public string Id { get; }
+
+    /// <summary>
+    /// Allows for the Assigning of a value one can use to select an element during automated testing.
+    /// </summary>
+    [Parameter] public string TestId { get; set; }
+
+    [Inject] public IMediator Mediator { get; set; }
+    [Inject] public IStore Store { get; set; }
+
+    /// <summary>
+    /// Maintains all components that subscribe to a State.
+    /// Is updated by using the GetState method
+    /// </summary>
+    [Inject] public Subscriptions Subscriptions { get; set; }
+
+    /// <summary>
+    /// Exposes StateHasChanged
+    /// </summary>
+    public void ReRender() => base.InvokeAsync(StateHasChanged);
+
+    /// <summary>
+    /// Place a Subscription for the calling component
+    /// And returns the requested state
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    protected T GetState<T>()
+    {
+      Type stateType = typeof(T);
+      Subscriptions.Add(stateType, this);
+      return Store.GetState<T>();
+    }
+
+    public void Dispose() => Subscriptions.Remove(this);
+  }
 }