Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack

Author: DaftMonk

Diff for: app/templates/Gruntfile.js

@@ -247,7 +247,7 @@ module.exports = function (grunt) {
     },
 
     // Automatically inject Bower components into the app
-    bowerInstall: {
+    wiredep: {
       target: {
         src: '<%%= yeoman.client %>/index.html',
         ignorePath: '<%%= yeoman.client %>/',
@@ -703,7 +703,7 @@ module.exports = function (grunt) {
         'injector:sass', <% } %>
         'concurrent:server',
         'injector',
-        'bowerInstall',
+        'wiredep',
         'autoprefixer',
         'concurrent:debug'
       ]);
@@ -717,7 +717,7 @@ module.exports = function (grunt) {
       'injector:sass', <% } %>
       'concurrent:server',
       'injector',
-      'bowerInstall',
+      'wiredep',
       'autoprefixer',
       'express:dev',
       'wait',
@@ -764,7 +764,7 @@ module.exports = function (grunt) {
         'injector:sass', <% } %>
         'concurrent:test',
         'injector',
-        'bowerInstall',
+        'wiredep',
         'autoprefixer',
         'express:dev',
         'protractor'
@@ -784,7 +784,7 @@ module.exports = function (grunt) {
     'injector:sass', <% } %>
     'concurrent:dist',
     'injector',
-    'bowerInstall',
+    'wiredep',
     'useminPrepare',
     'autoprefixer',
     'ngtemplates',

Diff for: app/templates/_package.json

@@ -31,7 +31,7 @@
   "devDependencies": {
     "grunt": "~0.4.4",
     "grunt-autoprefixer": "~0.7.2",
-    "grunt-bower-install": "~1.4.0",
+    "grunt-wiredep": "~1.8.0",
     "grunt-concurrent": "~0.5.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.4.0",

Diff for: readme.md

@@ -225,7 +225,7 @@ A live application URL will be available in the output.
 >
 > If you're using socket.io, you will need to update the client to connect to the correct port for sockets to work.
 >
-> In `/client/app/components/socket/socket.service` update the socket to connect to port 8000. (with `my-openshift-app` being the deployed name of your app):
+> In `/client/components/socket/socket.service` update the socket to connect to port 8000. (with `my-openshift-app` being the deployed name of your app):
 >
 >     var ioSocket = io.connect('my-openshift-app.com:8000');
 >