From f9ee9cdff198241b047209edaf30626c18a7b120 Mon Sep 17 00:00:00 2001
From: mattgreen <matt@dealleo.com>
Date: Thu, 23 Mar 2017 15:47:33 -0700
Subject: [PATCH] Removes socket.io-client reference from index.html Adds
 socket-io-client to bower Fixes issue with gulp wiredep removing the string
 'client' from added packages with the word 'client' in it's name Closes #2524

---
 templates/app/_bower.json             | 1 +
 templates/app/client/index.html       | 3 +--
 templates/app/gulpfile.babel(gulp).js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/app/_bower.json b/templates/app/_bower.json
index b2bcd90bd..d5b743ec9 100644
--- a/templates/app/_bower.json
+++ b/templates/app/_bower.json
@@ -15,6 +15,7 @@
     "angular-bootstrap": "~1.1.2",<% } %>
     "font-awesome": ">=4.1.0",
     "lodash": "~2.4.1"<% if(filters.socketio) { %>,
+    "socket-io-client": "^1.4.5",
     "angular-socket-io": "~0.7.0"<% } if (filters.uirouter) { %>,
     "angular-ui-router": "~0.2.15"<% } if (filters.auth) { %>,
     "angular-validation-match": "~1.5.2"<% } %>
diff --git a/templates/app/client/index.html b/templates/app/client/index.html
index 807f85068..fe3851aae 100644
--- a/templates/app/client/index.html
+++ b/templates/app/client/index.html
@@ -48,8 +48,7 @@
     <![endif]-->
     <!-- build:js({client,node_modules}) app/vendor.js -->
       <!-- bower:js -->
-      <!-- endbower --><% if (filters.socketio) { %>
-      <script src="socket.io-client/socket.io.js"></script><% } %>
+      <!-- endbower -->
     <!-- endbuild -->
     <!-- build:js(<% if(filters.babel) { %>.tmp<% }
     else { %>{.tmp,client}<% } %>) app/app.js -->
diff --git a/templates/app/gulpfile.babel(gulp).js b/templates/app/gulpfile.babel(gulp).js
index 3043f863b..d2ccd4cfa 100644
--- a/templates/app/gulpfile.babel(gulp).js
+++ b/templates/app/gulpfile.babel(gulp).js
@@ -523,7 +523,7 @@ gulp.task('wiredep:client', () => {
                 /bootstrap-sass-official/<% } if(filters.oauth) { %>,
                 /bootstrap-social\.css/<% }}} %>
             ],
-            ignorePath: clientPath
+            ignorePath: './' + clientPath
         }))
         .pipe(gulp.dest(`${clientPath}/`));
 });