Fixes up bower installer, no longer using grunt-bower-task since it is old and doesn't support the copying that we need, updates to latest bower dependency

This commit is contained in:
Shannon
2015-06-24 11:15:04 +02:00
parent c64bd5f65a
commit fde162b086
3 changed files with 17 additions and 17 deletions

View File

@@ -3,7 +3,7 @@
"version": "7",
"homepage": "https://github.com/umbraco/Umbraco-CMS",
"authors": [
"Shannon <sdeminick@umbraco.com>"
"Shannon <shannon@umbraco.com>"
],
"description": "Umbraco CMS",
"license": "MIT",
@@ -22,12 +22,10 @@
"rgrove-lazyload": "*",
"bootstrap-social": "~4.8.0",
"jquery": "2.0.3",
"jquery-file-upload": "~9.4.0",
"jquery-ui": "1.10.3",
"angular-dynamic-locale": "~0.1.27",
"ng-file-upload": "~3.0.2",
"tinymce": "~4.1.10",
"bootstrap-tabdrop": "~1.0.0"
}
}
}

View File

@@ -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']);
@@ -410,12 +410,12 @@ module.exports = function (grunt) {
}
},
bower: {
bower: {
dev: {
dest: '<%= distdir %>/lib',
options: {
expand: true,
ignorePackages: ['blueimp-canvas-to-blob', 'blueimp-tmpl', 'bootstrap'],
ignorePackages: ['bootstrap'],
packageSpecific: {
'typeahead.js': {
keepExpandedHierarchy: false
@@ -438,18 +438,10 @@ module.exports = function (grunt) {
'jquery': {
files: ['jquery.min.js', 'jquery.min.map']
},
'jquery-file-upload': {
keepExpandedHierarchy: false,
files: ['js/jquery.fileupload.js', 'js/jquery.fileupload-process.js', 'js/jquery.fileupload-angular.js', 'js/jquery.fileupload-image.js']
},
'jquery-ui': {
keepExpandedHierarchy: false,
files: ['ui/minified/jquery-ui.min.js']
},
'blueimp-load-image': {
keepExpandedHierarchy: false,
files: ['js/load-image.all.min.js']
},
'tinymce': {
files: ['plugins/**', 'themes/**', 'tinymce.min.js']
},
@@ -469,6 +461,13 @@ module.exports = function (grunt) {
options: {
expand: true
}
},
"bower-install-simple": {
options: {
color: true
},
"dev": {}
}
});
@@ -486,6 +485,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');

View File

@@ -21,9 +21,11 @@
},
"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-bower-task": "^0.4.0",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-concat": "~0.1.3",
"grunt-contrib-connect": "~0.3.0",