Fixed bug #766 signalr

Updated signalr client version
Add signalr and toast js libs to libman

Author: Ramón Tomás

.dockerignore

@@ -28,9 +28,7 @@ cli-linux
 **/obj/
 **/node_modules/
 **/bower_components/
-**/wwwroot/lib/
-!**/wwwroot/lib/signalr/*
-!**/wwwroot/lib/toastr/*
+**/wwwroot/lib/*
 global.json
 **/appsettings.localhost.json
 src/Web/WebSPA/wwwroot/

src/Web/WebMVC/Views/Shared/_Layout.cshtml

@@ -69,13 +69,13 @@
     </footer>
 
     <environment names="Development">
-        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/jquery/jquery.js"></script>
         <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
         <script src="~/js/site.js" asp-append-version="true"></script>
     </environment>
     <environment names="Staging,Production">
         <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
-                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-src="~/lib/jquery/jquery.min.js"
                 asp-fallback-test="window.jQuery">
         </script>
         <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
@@ -106,18 +106,19 @@
         }
 
         function stablishConnection() {
-            let hubHttpConnection = new signalR.HttpConnection('@settings.Value.SignalrHubUrl/hub/notificationhub', {
-            transport: signalR.TransportType.LongPolling,
-                accessTokenFactory: () => {
-                    return "Authorization", getToken();
-                }
-            });
-            return new signalR.HubConnection(hubHttpConnection);
+            return new signalR.HubConnectionBuilder()
+                .withUrl('@settings.Value.SignalrHubUrl/hub/notificationhub', {
+                    transport: signalR.HttpTransportType.LongPolling,
+                    accessTokenFactory: () => {
+                        return "Authorization", getToken();
+                    }
+                })
+                .build();
         }
 
         function registerNotificationHandlers(connection) {
             connection.on("UpdatedOrderState", (message) => {
-            toastr.success('Updated to status: ' + message.status, 'Order Id: ' + message.orderId);
+                toastr.success('Updated to status: ' + message.status, 'Order Id: ' + message.orderId);
                 if (window.location.pathname.split("/").pop() === 'Order') {
                     refreshOrderList();
                 }

src/Web/WebMVC/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,10 +1,10 @@
 <environment names="Development">
-    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validate/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
 <environment names="Staging,Production">
     <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
-            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validate/jquery.validate.min.js"
             asp-fallback-test="window.jQuery && window.jQuery.validator">
     </script>
     <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"

src/Web/WebMVC/WebMVC.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <UserSecretsId>aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
+    <TypeScriptToolsVersion>3.0</TypeScriptToolsVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Web/WebMVC/bundleconfig.json

@@ -11,8 +11,8 @@
   {
     "outputFileName": "wwwroot/js/site.js",
     "inputFiles": [
-      "wwwroot/lib/signalr/signalr.js",
-      "wwwroot/lib/toastr/toastr.js"
+      "wwwroot/lib/@aspnet/signalr/dist/browser/signalr.js",
+      "wwwroot/lib/toastr/toastr.min.js"
     ],
     // Optionally specify minification options
     "minify": {

src/Web/WebMVC/libman.json

@@ -14,6 +14,27 @@
     {
       "library": "[email protected]",
       "destination": "wwwroot/lib/jquery-validation-unobtrusive/"
-    } 
+    },
+    {
+      "library": "[email protected]",
+      "destination": "wwwroot/lib/jquery-validate/",
+      "files": [
+        "jquery.validate.min.js",
+        "jquery.validate.js"
+      ]
+    },
+    {
+      "library": "[email protected]",
+      "destination": "wwwroot/lib/toastr/"
+    },
+    {
+      "provider": "unpkg",
+      "library": "@aspnet/[email protected]",
+      "files": [    
+        "dist/browser/signalr.js",
+        "dist/browser/signalr.min.js"
+      ],
+      "destination": "wwwroot/lib/@aspnet/signalr/"
+    }
   ]
 }