Merge pull request #691 from eddiemonge/wiredep

feat(build): replace grunt-bower-install with grunt-wiredep
yeoman · May 13, 2014 · f01edba · f01edba
2 parents ec521e2 + 60ef8d1
commit f01edba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/index.js b/app/index.js
@@ -265,7 +265,7 @@ Generator.prototype._injectDependencies = function _injectDependencies() {
       'After running `npm install & bower install`, inject your front end dependencies' +
       '\ninto your source code by running:' +
       '\n' +
-      '\n' + chalk.yellow.bold('grunt bowerInstall')
+      '\n' + chalk.yellow.bold('grunt wiredep')
     );
   } else {
     wiredep({

diff --git a/templates/common/root/_Gruntfile.js b/templates/common/root/_Gruntfile.js
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
     watch: {
       bower: {
         files: ['bower.json'],
-        tasks: ['bowerInstall']
+        tasks: ['wiredep']
       },<% if (coffee) { %>
       coffee: {
         files: ['<%%= yeoman.app %>/scripts/{,*/}*.{coffee,litcoffee,coffee.md}'],
@@ -160,7 +160,7 @@ module.exports = function (grunt) {
     },
 
     // Automatically inject Bower components into the app
-    bowerInstall: {
+    wiredep: {
       app: {
         src: ['<%%= yeoman.app %>/index.html'],
         ignorePath: new RegExp('^<%%= yeoman.app %>/')
@@ -433,7 +433,7 @@ module.exports = function (grunt) {
 
     grunt.task.run([
       'clean:server',
-      'bowerInstall',
+      'wiredep',
       'concurrent:server',
       'autoprefixer',
       'connect:livereload',
@@ -456,7 +456,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('build', [
     'clean:dist',
-    'bowerInstall',
+    'wiredep',
     'useminPrepare',
     'concurrent:dist',
     'autoprefixer',

diff --git a/templates/common/root/_package.json b/templates/common/root/_package.json
@@ -5,7 +5,6 @@
   "devDependencies": {
     "grunt": "^0.4.1",
     "grunt-autoprefixer": "^0.7.3",
-    "grunt-bower-install": "^1.4.1",
     "grunt-concurrent": "^0.5.0",
     "grunt-contrib-clean": "^0.5.0",<% if (coffee) { %>
     "grunt-contrib-coffee": "^0.10.1",<% } %><% if (compass) { %>
@@ -25,6 +24,7 @@
     "grunt-ngmin": "^0.0.3",
     "grunt-svgmin": "^0.4.0",
     "grunt-usemin": "^2.1.1",
+    "grunt-wiredep": "^1.7.0",
     "jshint-stylish": "^0.2.0",
     "load-grunt-tasks": "^0.4.0",
     "time-grunt": "^0.3.1"