0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00

unfuck the gruntifle

This commit is contained in:
Mark Otto 2014-05-12 22:01:29 -07:00
parent e52920ca87
commit 58f03754c6

View File

@ -20,7 +20,7 @@ module.exports = function (grunt) {
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js'); var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js'); var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
var generateRawFiles = require('./grunt/bs-raw-files-generator.js'); var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
// var updateShrinkwrap = require('./grunt/shrinkwrap.js'); var updateShrinkwrap = require('./grunt/shrinkwrap.js');
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
@ -182,6 +182,7 @@ module.exports = function (grunt) {
}, },
files: { files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', 'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-rtl.min.css': 'dist/css/<%= pkg.name %>-rtl.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css' 'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
} }
} }
@ -237,8 +238,7 @@ module.exports = function (grunt) {
cssmin: { cssmin: {
options: { options: {
compatibility: 'ie8', compatibility: 'ie8',
keepSpecialComments: '*', keepSpecialComments: '*'
noAdvanced: true
}, },
docs: { docs: {
src: [ src: [
@ -388,9 +388,9 @@ module.exports = function (grunt) {
npmUpdate: { npmUpdate: {
command: 'npm update' command: 'npm update'
}, },
// npmShrinkWrap: { npmShrinkWrap: {
// command: 'npm shrinkwrap --dev' command: 'npm shrinkwrap --dev'
// } }
} }
}); });
@ -435,7 +435,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js', 'dist-docs']); grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js', 'dist-docs']);
// Default task. // Default task.
grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer']); grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer', 'update-shrinkwrap']);
// Version numbering task. // Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
@ -453,6 +453,6 @@ module.exports = function (grunt) {
}); });
// Task for updating the npm packages used by the Travis build. // Task for updating the npm packages used by the Travis build.
// grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '_update-shrinkwrap']); grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '_update-shrinkwrap']);
// grunt.registerTask('_update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); }); grunt.registerTask('_update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); });
}; };