From f82d8a5df13152e0748b454641eed3d363eb0145 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 24 Jun 2015 11:39:50 +0200 Subject: [PATCH] updates bower and bower install task. --- src/Umbraco.Web.UI.Client/gruntFile.js | 12 ++++++++++-- src/Umbraco.Web.UI.Client/package.json | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index a8cb4d28da..2a62fca086 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -18,10 +18,10 @@ module.exports = function (grunt) { grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']); //triggered from grunt dev or grunt - grunt.registerTask('build', ['clean', 'concat', 'recess:min', 'recess:installer', 'recess:canvasdesigner', 'bower', 'copy']); + grunt.registerTask('build', ['clean', 'concat', 'recess:min', 'recess:installer', 'recess:canvasdesigner', 'bower-install-simple', 'bower', 'copy']); //build-dev doesn't min - we are trying to speed this up and we don't want minified stuff when we are in dev mode - grunt.registerTask('build-dev', ['clean', 'concat', 'recess:build', 'recess:installer', 'bower', 'copy']); + grunt.registerTask('build-dev', ['clean', 'concat', 'recess:build', 'recess:installer', 'bower-install-simple', 'bower', 'copy']); //utillity tasks grunt.registerTask('docs', ['ngdocs']); @@ -465,6 +465,13 @@ module.exports = function (grunt) { options: { expand: true } + }, + + "bower-install-simple": { + options: { + color: true + }, + "dev": {} } }); @@ -482,6 +489,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-open'); grunt.loadNpmTasks('grunt-contrib-connect'); + grunt.loadNpmTasks("grunt-bower-install-simple"); grunt.loadNpmTasks('grunt-bower'); grunt.loadNpmTasks('grunt-ngdocs'); diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index a7cc52358d..aa83829193 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -21,9 +21,10 @@ }, "dependencies": {}, "devDependencies": { - "bower": "~1.3.3", + "bower": "^1.4.1", "grunt": "~0.4.0", "grunt-bower": "^0.19.0", + "grunt-bower-install-simple": "^1.1.3", "grunt-contrib-clean": "~0.4.0", "grunt-contrib-concat": "~0.1.3", "grunt-contrib-connect": "~0.3.0",