From ef948ece79f7bfc62c465b4f7930f85b868eb8fe Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Feb 2016 00:34:29 -0800 Subject: Integrate postcss-flexbugs-fixes into build; fixes #18569 --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b2f702e4e..b49cdce50 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -212,6 +212,7 @@ module.exports = function (grunt) { map: true, processors: [ mq4HoverShim.postprocessorFor({ hoverSelectorPrefix: '.bs-true-hover ' }), + require('postcss-flexbugs-fixes')(), autoprefixer ] }, -- cgit v1.2.3 From 0c4abb69e3c37cb454e6c3003763171528576ad1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 17:46:36 -0700 Subject: Kill the grunt-jscs middleman; use JSCS directly instead (#20069) Refs #19990 [skip sauce] [skip validator] --- Gruntfile.js | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b49cdce50..e5d677d55 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -107,27 +107,6 @@ module.exports = function (grunt) { } }, - jscs: { - options: { - config: 'js/.jscsrc' - }, - grunt: { - src: ['Gruntfile.js', 'grunt/*.js'] - }, - core: { - src: 'js/src/*.js' - }, - test: { - src: 'js/tests/unit/*.js' - }, - assets: { - options: { - requireCamelCaseOrUpperCaseIdentifiers: null - }, - src: ['docs/assets/js/src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js'] - } - }, - stamp: { options: { banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>\n+function ($) {\n', @@ -321,7 +300,7 @@ module.exports = function (grunt) { watch: { src: { - files: '<%= jscs.core.src %>', + files: '<%= concat.bootstrap.src %>', tasks: ['babel:dev'] }, sass: { @@ -412,7 +391,7 @@ module.exports = function (grunt) { if (runSubset('core') && // Skip core tests if this is a Savage build process.env.TRAVIS_REPO_SLUG !== 'twbs-savage/bootstrap') { - testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'test-scss', 'test-js', 'docs']); + testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'test-scss', 'qunit', 'docs']); } // Skip HTML validation if running a different subset of the test suite if (runSubset('validate-html') && @@ -432,7 +411,6 @@ module.exports = function (grunt) { testSubtasks.push('saucelabs-qunit'); } grunt.registerTask('test', testSubtasks); - grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); // JS distribution task. grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); @@ -469,8 +447,7 @@ module.exports = function (grunt) { grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'cssmin:docs']); grunt.registerTask('lint-docs-css', ['scsslint:docs']); grunt.registerTask('docs-js', ['uglify:docsJs']); - grunt.registerTask('lint-docs-js', ['jscs:assets']); - grunt.registerTask('docs', ['lint-docs-css', 'docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']); + grunt.registerTask('docs', ['lint-docs-css', 'docs-css', 'docs-js', 'clean:docs', 'copy:docs']); grunt.registerTask('docs-github', ['jekyll:github']); grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']); -- cgit v1.2.3 From 36f2261b6ffff5d4803317fc4fd231769f625295 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 21:55:28 -0700 Subject: Remove unused exec:npmUpdate Grunt task (#20074) [skip sauce] [skip validator] --- Gruntfile.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index e5d677d55..28fb1441a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -327,9 +327,6 @@ module.exports = function (grunt) { }, exec: { - npmUpdate: { - command: 'npm update' - } }, buildcontrol: { -- cgit v1.2.3 From ce2e944aa6957528f23f1f7e680ac0cb4a75dcac Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 10 Jun 2016 09:28:03 -0700 Subject: Strip out UMD & CJS in favor of ES6 modules (#20072) --- Gruntfile.js | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 28fb1441a..1c6415329 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,6 @@ module.exports = function (grunt) { var autoprefixerSettings = require('./grunt/autoprefixer-settings.js'); var autoprefixer = require('autoprefixer')(autoprefixerSettings); - var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js'); var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' }); Object.keys(configBridge.paths).forEach(function (key) { @@ -86,24 +85,6 @@ module.exports = function (grunt) { files: { '<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>' } - }, - umd: { - options: { - modules: 'umd' - }, - files: { - 'dist/js/umd/util.js' : 'js/src/util.js', - 'dist/js/umd/alert.js' : 'js/src/alert.js', - 'dist/js/umd/button.js' : 'js/src/button.js', - 'dist/js/umd/carousel.js' : 'js/src/carousel.js', - 'dist/js/umd/collapse.js' : 'js/src/collapse.js', - 'dist/js/umd/dropdown.js' : 'js/src/dropdown.js', - 'dist/js/umd/modal.js' : 'js/src/modal.js', - 'dist/js/umd/scrollspy.js' : 'js/src/scrollspy.js', - 'dist/js/umd/tab.js' : 'js/src/tab.js', - 'dist/js/umd/tooltip.js' : 'js/src/tooltip.js', - 'dist/js/umd/popover.js' : 'js/src/popover.js' - } } }, @@ -410,7 +391,7 @@ module.exports = function (grunt) { grunt.registerTask('test', testSubtasks); // JS distribution task. - grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); + grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core']); grunt.registerTask('test-scss', ['scsslint:core']); @@ -430,16 +411,6 @@ module.exports = function (grunt) { // Default task. grunt.registerTask('default', ['clean:dist', 'test']); - grunt.registerTask('commonjs', ['babel:umd', 'npm-js']); - - grunt.registerTask('npm-js', 'Generate npm-js entrypoint module in dist dir.', function () { - var srcFiles = Object.keys(grunt.config.get('babel.umd.files')).map(function (filename) { - return './' + path.join('umd', path.basename(filename)) - }) - var destFilepath = 'dist/js/npm.js'; - generateCommonJSModule(grunt, srcFiles, destFilepath); - }); - // Docs task. grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'cssmin:docs']); grunt.registerTask('lint-docs-css', ['scsslint:docs']); -- cgit v1.2.3