Merge pull request #1127 from kingcody/feature/wiredep-karma

feat(app): use wiredep to inject bower deps into karma.conf.js

Author: Awk34

app/templates/Gruntfile.js

@@ -72,7 +72,7 @@ module.exports = function (grunt) {
       },
       jsTest: {
         files: ['<%%= yeoman.client %>/{app,components}/**/*.{spec,mock}.js'],
-        tasks: ['newer:jshint:all', 'karma']
+        tasks: ['newer:jshint:all', 'wiredep:test', 'karma']
       },<% if (filters.stylus) { %>
       injectStylus: {
         files: ['<%%= yeoman.client %>/{app,components}/**/*.styl'],
@@ -240,12 +240,26 @@ module.exports = function (grunt) {
       }
     },
 
-    // Automatically inject Bower components into the app
+    // Automatically inject Bower components into the app and karma.conf.js
     wiredep: {
-      target: {
+      options: {
+        exclude: [
+          /angular-scenario/,
+          /bootstrap-sass-official/,
+          /bootstrap.js/,
+          '/json3/',
+          '/es5-shim/'<% if(!filters.css) { %>,
+          /bootstrap.css/,
+          /font-awesome.css/<% } %>
+        ]
+      },
+      client: {
         src: '<%%= yeoman.client %>/index.html',
         ignorePath: '<%%= yeoman.client %>/',
-        exclude: [/bootstrap-sass-official/, /bootstrap.js/, '/json3/', '/es5-shim/'<% if(!filters.css) { %>, /bootstrap.css/, /font-awesome.css/ <% } %>]
+      },
+      test: {
+        src: './karma.conf.js',
+        devDependencies: true
       }
     },
 
@@ -773,7 +787,7 @@ module.exports = function (grunt) {
         'injector:sass',<% } %>
         'concurrent:server',
         'injector',
-        'wiredep',
+        'wiredep:client',
         'postcss',
         'concurrent:debug'
       ]);
@@ -787,7 +801,7 @@ module.exports = function (grunt) {
       'injector:sass',<% } %>
       'concurrent:server',
       'injector',
-      'wiredep',
+      'wiredep:client',
       'postcss',
       'express:dev',
       'wait',
@@ -821,6 +835,7 @@ module.exports = function (grunt) {
         'concurrent:test',
         'injector',
         'postcss',
+        'wiredep:test',
         'karma'
       ]);
     }
@@ -847,7 +862,7 @@ module.exports = function (grunt) {
           'injector:sass',<% } %>
           'concurrent:test',
           'injector',
-          'wiredep',
+          'wiredep:client',
           'postcss',
           'express:dev',
           'protractor'
@@ -903,7 +918,7 @@ module.exports = function (grunt) {
     'injector:sass',<% } %>
     'concurrent:dist',
     'injector',
-    'wiredep',
+    'wiredep:client',
     'useminPrepare',
     'postcss',
     'ngtemplates',

app/templates/_package.json

@@ -36,7 +36,7 @@
   "devDependencies": {
     "autoprefixer-core": "^5.2.1",
     "grunt": "~0.4.4",
-    "grunt-wiredep": "~1.8.0",
+    "grunt-wiredep": "^2.0.0",
     "grunt-concurrent": "~0.5.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.4.0",

app/templates/karma.conf.js

@@ -12,17 +12,9 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'client/bower_components/jquery/dist/jquery.js',
-      'client/bower_components/angular/angular.js',
-      'client/bower_components/angular-mocks/angular-mocks.js',
-      'client/bower_components/angular-resource/angular-resource.js',
-      'client/bower_components/angular-cookies/angular-cookies.js',
-      'client/bower_components/angular-sanitize/angular-sanitize.js',
-      'client/bower_components/angular-route/angular-route.js',<% if (filters.uibootstrap) { %>
-      'client/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',<% } %>
-      'client/bower_components/lodash/dist/lodash.compat.js',<% if (filters.socketio) { %>
-      'client/bower_components/angular-socket-io/socket.js',<% } %><% if (filters.uirouter) { %>
-      'client/bower_components/angular-ui-router/release/angular-ui-router.js',<% } %>
+      // bower:js
+      // endbower<% if (filters.socketio) { %>
+      'node_modules/socket.io-client/socket.io.js',<% } %>
       'client/app/app.js',
       'client/app/app.coffee',
       'client/app/**/*.js',