bump .NET nuget packages; bump npm packages; refactor VueCliMiddleware configuration in web api (Startup.cs)

based-ghost · based-ghost · commit 68d3dc4a554a · 2021-07-14T14:57:17.000-05:00
diff --git a/GhostUI/ClientApp/package.json b/GhostUI/ClientApp/package.json
@@ -15,44 +15,44 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
-    "@microsoft/signalr": "^5.0.5",
+    "@microsoft/signalr": "^5.0.8",
     "axios": "^0.21.1",
-    "bulma": "^0.9.2",
-    "core-js": "^3.11.0",
+    "bulma": "^0.9.3",
+    "core-js": "^3.15.2",
     "register-service-worker": "^1.7.2",
-    "vue": "^2.6.12",
+    "vue": "^2.6.14",
     "vue-class-component": "^7.2.6",
     "vue-property-decorator": "^9.1.2",
-    "vue-router": "^3.5.1",
+    "vue-router": "^3.5.2",
     "vue-snotify": "^3.2.1",
     "vue-styled-components": "^1.6.0",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.10",
-    "@types/jest": "^26.0.22",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
-    "@vue/cli-plugin-babel": "^4.5.12",
-    "@vue/cli-plugin-e2e-nightwatch": "^4.5.12",
-    "@vue/cli-plugin-eslint": "^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",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@types/jest": "^26.0.24",
+    "@typescript-eslint/eslint-plugin": "^4.28.3",
+    "@typescript-eslint/parser": "^4.28.3",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-e2e-nightwatch": "^4.5.13",
+    "@vue/cli-plugin-eslint": "^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/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "@vue/test-utils": "1.1.4",
-    "eslint": "^7.24.0",
+    "@vue/test-utils": "1.2.1",
+    "eslint": "^7.30.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.9.0",
-    "node-sass": "^5.0.0",
-    "prettier": "^2.2.1",
+    "eslint-plugin-vue": "^7.13.0",
+    "prettier": "^2.3.2",
+    "sass": "^1.35.2",
     "sass-loader": "^10.1.1",
-    "ts-jest": "^26.5.5",
-    "typescript": "^4.2.4",
+    "ts-jest": "^27.0.3",
+    "typescript": "^4.3.5",
     "vue-svg-loader": "^0.16.0",
-    "vue-template-compiler": "^2.6.12",
+    "vue-template-compiler": "^2.6.14",
     "vuex-module-decorators": "^1.0.1"
   }
 }
diff --git a/GhostUI/ClientApp/src/App.vue b/GhostUI/ClientApp/src/App.vue
@@ -3,7 +3,10 @@
     <vue-snotify />
     <navbar />
     <settings />
-    <transition mode="out-in" :name="$route.meta.transitionName">
+    <transition
+      mode="out-in"
+      :name="$route.meta.transitionName"
+    >
       <router-view />
     </transition>
     <app-footer />
diff --git a/GhostUI/ClientApp/src/plugins/vue-click-outside.ts b/GhostUI/ClientApp/src/plugins/vue-click-outside.ts
@@ -22,7 +22,7 @@ const vClickOutside = {
 
       unbind: function(el) {
         if (el.clickOutsideEvent) {
-          DEFAULT_EVENTS.forEach((type) => document?.removeEventListener(type, el.clickOutsideEvent));
+          DEFAULT_EVENTS.forEach((type) => document.removeEventListener(type, el.clickOutsideEvent));
         }
       }
     });
diff --git a/GhostUI/ClientApp/src/store/modules/auth/index.ts b/GhostUI/ClientApp/src/store/modules/auth/index.ts
@@ -1,10 +1,4 @@
-﻿import { AuthModule } from './auth.module';
-import { AuthStatusEnum, IAuthUser, IAuthState, ICredentials } from './types';
+﻿export { AuthModule } from './auth.module';
+export { AuthStatusEnum } from './types';
 
-export {
-  AuthModule,
-  IAuthUser,
-  IAuthState,
-  ICredentials,
-  AuthStatusEnum
-};
+export type { IAuthUser, IAuthState, ICredentials } from './types';
diff --git a/GhostUI/ClientApp/src/store/modules/form/index.ts b/GhostUI/ClientApp/src/store/modules/form/index.ts
@@ -1,8 +1,3 @@
-﻿import { FormModule } from './form.module';
-import { IDropdownOption, IFormState } from './types';
+﻿export { FormModule } from './form.module';
 
-export {
-  FormModule,
-  IDropdownOption,
-  IFormState
-};
+export type { IDropdownOption, IFormState } from './types';
diff --git a/GhostUI/ClientApp/src/store/modules/weather-forecasts/index.ts b/GhostUI/ClientApp/src/store/modules/weather-forecasts/index.ts
@@ -1,8 +1,3 @@
-﻿import { WeatherForecastModule } from './weather-forecasts.module';
-import { IWeatherForecast, IWeatherForecastsState } from './types';
+﻿export { WeatherForecastModule } from './weather-forecasts.module';
 
-export {
-  WeatherForecastModule,
-  IWeatherForecast,
-  IWeatherForecastsState
-};
+export type { IWeatherForecast, IWeatherForecastsState } from './types';
diff --git a/GhostUI/ClientApp/src/utils/isArrayWithLength.ts b/GhostUI/ClientApp/src/utils/isArrayWithLength.ts
@@ -1,3 +1,3 @@
-const isArrayWithLength = (test: any): boolean => Array.isArray(test) && !!test.length;
+const isArrayWithLength = (val: unknown): boolean => Array.isArray(val) && !!val.length;
 
 export default isArrayWithLength;
diff --git a/GhostUI/GhostUI.csproj b/GhostUI/GhostUI.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.10.9" />
-    <PackageReference Include="NSwag.MSBuild" Version="13.10.9">
+    <PackageReference Include="NSwag.AspNetCore" Version="13.11.3" />
+    <PackageReference Include="NSwag.MSBuild" Version="13.11.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/GhostUI/Startup.cs b/GhostUI/Startup.cs
@@ -43,9 +43,6 @@ public void ConfigureServices(IServiceCollection services)
             // Add CORS
             services.AddCorsConfig(_corsPolicyName);
 
-            // Register RazorPages/Controllers
-            services.AddControllers();
-
             // Add Brotli/Gzip response compression (prod only)
             services.AddResponseCompressionConfig(Configuration);
 
@@ -58,6 +55,9 @@ public void ConfigureServices(IServiceCollection services)
             // In production, the Vue files will be served from this directory
             services.AddSpaStaticFiles(opt => opt.RootPath = $"{_spaSourcePath}/dist");
 
+            // Register RazorPages/Controllers
+            services.AddControllers();
+
             // Register the Swagger services (using OpenApi 3.0)
             services.AddOpenApiDocument(configure => configure.Title = $"{this.GetType().Namespace} API");
         }
@@ -126,21 +126,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 endpoints.MapControllers();
                 endpoints.MapHub<UsersHub>("/hubs/users");
 
-                if (System.Diagnostics.Debugger.IsAttached)
-                {
-                    endpoints.MapToVueCliProxy(
-                       "{*path}",
-                       new SpaOptions { SourcePath = _spaSourcePath },
-                       npmScript: "serve",
-                       regex: "running at",
-                       port: 3001,
-                       forceKill: true
-                    );
-                }
-                else
-                {
-                    endpoints.MapFallbackToFile("index.html");
-                }
+                endpoints.MapToVueCliProxy(
+                   "{*path}",
+                   new SpaOptions { SourcePath = _spaSourcePath },
+                   npmScript: System.Diagnostics.Debugger.IsAttached ? "serve" : null,
+                   regex: "Compiled successfully",
+                   port: 3001,
+                   forceKill: true
+                );
             });
         }
     }
diff --git a/GhostUI/wwwroot/docs/api-specification.json b/GhostUI/wwwroot/docs/api-specification.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v12.0.0.0))",
+  "x-generator": "NSwag v13.11.3.0 (NJsonSchema v10.4.4.0 (Newtonsoft.Json v12.0.0.0))",
   "openapi": "3.0.0",
   "info": {
     "title": "GhostUI API",

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const vClickOutside = {`
`22`	`22`
`23`	`23`	`unbind: function(el) {`
`24`	`24`	`if (el.clickOutsideEvent) {`
`25`		`- DEFAULT_EVENTS.forEach((type) => document?.removeEventListener(type, el.clickOutsideEvent));`
	`25`	`+ DEFAULT_EVENTS.forEach((type) => document.removeEventListener(type, el.clickOutsideEvent));`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-const isArrayWithLength = (test: any): boolean => Array.isArray(test) && !!test.length;`
	`1`	`+const isArrayWithLength = (val: unknown): boolean => Array.isArray(val) && !!val.length;`
`2`	`2`
`3`	`3`	`export default isArrayWithLength;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "x-generator": "NSwag v13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v12.0.0.0))",`
	`2`	`+ "x-generator": "NSwag v13.11.3.0 (NJsonSchema v10.4.4.0 (Newtonsoft.Json v12.0.0.0))",`
`3`	`3`	`"openapi": "3.0.0",`
`4`	`4`	`"info": {`
`5`	`5`	`"title": "GhostUI API",`