bump .NET nuget packages; bump npm packages

Author: based-ghost

FullStackTesting/FullStackTesting.Web.Api/ClientApp/package.json

@@ -11,31 +11,31 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "bulma": "^0.9.2",
+    "bulma": "^0.9.3",
     "register-service-worker": "^1.7.2",
-    "vue": "^2.6.12",
+    "vue": "^2.6.14",
     "vue-class-component": "^7.2.6",
     "vue-js-modal": "^1.3.35",
     "vue-property-decorator": "^9.1.2",
-    "vue-router": "^3.5.1",
+    "vue-router": "^3.5.2",
     "vue-snotify": "^3.2.1",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.10",
-    "@types/jest": "^26.0.22",
-    "@vue/cli-plugin-babel": "^4.5.12",
-    "@vue/cli-plugin-e2e-nightwatch": "^4.5.12",
-    "@vue/cli-plugin-pwa": "^4.5.12",
-    "@vue/cli-plugin-typescript": "^4.5.12",
-    "@vue/cli-plugin-unit-jest": "^4.5.12",
-    "@vue/cli-service": "^4.5.12",
-    "@vue/test-utils": "1.1.3",
-    "node-sass": "^5.0.0",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@types/jest": "^26.0.24",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-e2e-nightwatch": "^4.5.13",
+    "@vue/cli-plugin-pwa": "^4.5.13",
+    "@vue/cli-plugin-typescript": "^4.5.13",
+    "@vue/cli-plugin-unit-jest": "^4.5.13",
+    "@vue/cli-service": "^4.5.13",
+    "@vue/test-utils": "1.2.1",
+    "node-sass": "^6.0.1",
     "sass-loader": "^10.1.1",
-    "ts-jest": "^26.5.4",
-    "typescript": "^4.2.4",
-    "vue-template-compiler": "^2.6.12",
+    "ts-jest": "^27.0.3",
+    "typescript": "^4.3.5",
+    "vue-template-compiler": "^2.6.14",
     "vuex-module-decorators": "^1.0.1"
   }
 }

FullStackTesting/FullStackTesting.Web.Api/ClientApp/src/views/Employees.vue

@@ -106,7 +106,9 @@ export default class Employees extends Vue {
   }
 
   public async deleteEmployee(employee: IEmployee): Promise<void> {
-    if (this.loading) return;
+    if (this.loading) {
+      return;
+    }
 
     this.loading = true;
 
@@ -122,7 +124,9 @@ export default class Employees extends Vue {
   }
 
   public async handleGetEmployees(): Promise<void> {
-    if (this.loading) return;
+    if (this.loading) {
+      return;
+    }
 
     this.loading = true;
 

FullStackTesting/FullStackTesting.Web.Api/ClientApp/vue.config.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-param-reassign,import/no-extraneous-dependencies  */
 
 module.exports = {
-  configureWebpack: (config) => {
+  configureWebpack: () => {
     if (process.env.NODE_ENV !== 'production') {
       return {};
     }

FullStackTesting/FullStackTesting.Web.Api/FullStackTesting.Web.Api.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.8" />
     <PackageReference Include="VueCliMiddleware" Version="5.0.0" />
   </ItemGroup>
 

FullStackTesting/FullStackTesting.Web.Api/Startup.cs

@@ -19,15 +19,15 @@ public class Startup
         private readonly string _spaSourcePath;
         private readonly string _corsPolicyName;
 
+        public IConfiguration Configuration { get; }
+
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
             _spaSourcePath = Configuration.GetValue<string>("SPA:SourcePath");
             _corsPolicyName = Configuration.GetValue<string>("CORS:PolicyName");
         }
 
-        public IConfiguration Configuration { get; }
-
         public void ConfigureServices(IServiceCollection services)
         {
             // Register the in-memory db (Data is seeded in Main method of the Program.cs now).
@@ -42,14 +42,14 @@ public void ConfigureServices(IServiceCollection services)
                     .AllowAnyHeader()
                     .AllowAnyMethod()));
 
-            // Register RazorPages/Controllers
-            services.AddControllers();
-
             // IMPORTANT CONFIG CHANGE IN 3.0 - 'Async' suffix in action names get stripped by default - so, to access them by full name with 'Async' part - opt out of this feature'.
             services.AddMvc(options => options.SuppressAsyncSuffixInActionNames = false);
 
             // In production, the Vue files will be served from this directory
-            services.AddSpaStaticFiles(configuration => configuration.RootPath = $"{_spaSourcePath}/dist");
+            services.AddSpaStaticFiles(opt => opt.RootPath = $"{_spaSourcePath}/dist");
+
+            // Register RazorPages/Controllers
+            services.AddControllers();
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -84,27 +84,20 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseCors(_corsPolicyName);
 
             app.UseHttpsRedirection();
-            app.UseStaticFiles();
+            // app.UseStaticFiles();
             app.UseSpaStaticFiles();
             app.UseRouting();
 
             app.UseEndpoints(endpoints => {
                 endpoints.MapControllers();
 
-                if (System.Diagnostics.Debugger.IsAttached)
-                {
-                    endpoints.MapToVueCliProxy(
-                       "{*path}",
-                       new SpaOptions { SourcePath = _spaSourcePath },
-                       npmScript: "serve",
-                       regex: "running at",
-                       forceKill: true
-                    );
-                }
-                else
-                {
-                    endpoints.MapFallbackToFile("index.html");
-                }
+                endpoints.MapToVueCliProxy(
+                   "{*path}",
+                   new SpaOptions { SourcePath = _spaSourcePath },
+                   npmScript: System.Diagnostics.Debugger.IsAttached ? "serve" : null,
+                   regex: "Compiled successfully",
+                   forceKill: true
+                );
             });
         }
     }

FullStackTesting/tests/FullStackTesting.Web.Api.IntegrationTests/FullStackTesting.Web.Api.IntegrationTests.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
 	<FrameworkReference Include="Microsoft.AspNetCore.App" />
-	<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+	<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>