|
@@ -1,7 +1,8 @@
|
|
|
/*!
|
|
|
* Bootstrap's Gruntfile
|
|
|
- * http://getbootstrap.com
|
|
|
- * Copyright 2013-2015 Twitter, Inc.
|
|
|
+ * https://getbootstrap.com
|
|
|
+ * Copyright 2013-2016 The Bootstrap Authors
|
|
|
+ * Copyright 2013-2016 Twitter, Inc.
|
|
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
|
|
*/
|
|
|
|
|
@@ -17,48 +18,13 @@ module.exports = function (grunt) {
|
|
|
|
|
|
var fs = require('fs');
|
|
|
var path = require('path');
|
|
|
- var glob = require('glob');
|
|
|
var isTravis = require('is-travis');
|
|
|
- var npmShrinkwrap = require('npm-shrinkwrap');
|
|
|
- var mq4HoverShim = require('mq4-hover-shim');
|
|
|
- var autoprefixer = require('autoprefixer')({
|
|
|
- browsers: [
|
|
|
- //
|
|
|
- // Official browser support policy:
|
|
|
- // http://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#supported-browsers
|
|
|
- //
|
|
|
- 'Chrome >= 35', // Exact version number here is kinda arbitrary
|
|
|
- // Rather than using Autoprefixer's native "Firefox ESR" version specifier string,
|
|
|
- // we deliberately hardcode the number. This is to avoid unwittingly severely breaking the previous ESR in the event that:
|
|
|
- // (a) we happen to ship a new Bootstrap release soon after the release of a new ESR,
|
|
|
- // such that folks haven't yet had a reasonable amount of time to upgrade; and
|
|
|
- // (b) the new ESR has unprefixed CSS properties/values whose absence would severely break webpages
|
|
|
- // (e.g. `box-sizing`, as opposed to `background: linear-gradient(...)`).
|
|
|
- // Since they've been unprefixed, Autoprefixer will stop prefixing them,
|
|
|
- // thus causing them to not work in the previous ESR (where the prefixes were required).
|
|
|
- 'Firefox >= 31', // Current Firefox Extended Support Release (ESR)
|
|
|
- // Note: Edge versions in Autoprefixer & Can I Use refer to the EdgeHTML rendering engine version,
|
|
|
- // NOT the Edge app version shown in Edge's "About" screen.
|
|
|
- // For example, at the time of writing, Edge 20 on an up-to-date system uses EdgeHTML 12.
|
|
|
- // See also https://github.com/Fyrd/caniuse/issues/1928
|
|
|
- 'Edge >= 12',
|
|
|
- 'Explorer >= 9',
|
|
|
- // Out of leniency, we prefix these 1 version further back than the official policy.
|
|
|
- 'iOS >= 8',
|
|
|
- 'Safari >= 8',
|
|
|
- // The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them.
|
|
|
- 'Android 2.3',
|
|
|
- 'Android >= 4',
|
|
|
- 'Opera >= 12'
|
|
|
- ]
|
|
|
- });
|
|
|
|
|
|
- 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) {
|
|
|
configBridge.paths[key].forEach(function (val, i, arr) {
|
|
|
- arr[i] = path.join('./docs/assets', val);
|
|
|
+ arr[i] = path.join('./docs', val);
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -77,8 +43,8 @@ module.exports = function (grunt) {
|
|
|
'}\n',
|
|
|
jqueryVersionCheck: '+function ($) {\n' +
|
|
|
' var version = $.fn.jquery.split(\' \')[0].split(\'.\')\n' +
|
|
|
- ' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {\n' +
|
|
|
- ' throw new Error(\'Bootstrap\\\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0\')\n' +
|
|
|
+ ' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {\n' +
|
|
|
+ ' throw new Error(\'Bootstrap\\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0\')\n' +
|
|
|
' }\n' +
|
|
|
'}(jQuery);\n\n',
|
|
|
|
|
@@ -89,22 +55,10 @@ module.exports = function (grunt) {
|
|
|
},
|
|
|
|
|
|
// JS build configuration
|
|
|
- lineremover: {
|
|
|
- es6Import: {
|
|
|
- files: {
|
|
|
- '<%= concat.bootstrap.dest %>': '<%= concat.bootstrap.dest %>'
|
|
|
- },
|
|
|
- options: {
|
|
|
- exclusionPattern: /^(import|export)/g
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
babel: {
|
|
|
dev: {
|
|
|
options: {
|
|
|
- sourceMap: true,
|
|
|
- modules: 'ignore'
|
|
|
+ sourceMap: true
|
|
|
},
|
|
|
files: {
|
|
|
'js/dist/util.js' : 'js/src/util.js',
|
|
@@ -122,64 +76,18 @@ module.exports = function (grunt) {
|
|
|
},
|
|
|
dist: {
|
|
|
options: {
|
|
|
- modules: 'ignore'
|
|
|
+ extends: '../../js/.babelrc'
|
|
|
},
|
|
|
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'
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
- eslint: {
|
|
|
- options: {
|
|
|
- configFile: 'js/.eslintrc'
|
|
|
- },
|
|
|
- target: 'js/src/*.js'
|
|
|
- },
|
|
|
-
|
|
|
- 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',
|
|
|
- footer: '\n}(jQuery);'
|
|
|
+ banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>\n+function () {\n',
|
|
|
+ footer: '\n}();'
|
|
|
},
|
|
|
bootstrap: {
|
|
|
files: {
|
|
@@ -190,7 +98,10 @@ module.exports = function (grunt) {
|
|
|
|
|
|
concat: {
|
|
|
options: {
|
|
|
- stripBanners: false
|
|
|
+ // Custom function to remove all export and import statements
|
|
|
+ process: function (src) {
|
|
|
+ return src.replace(/^(export|import).*/gm, '');
|
|
|
+ }
|
|
|
},
|
|
|
bootstrap: {
|
|
|
src: [
|
|
@@ -242,48 +153,19 @@ module.exports = function (grunt) {
|
|
|
config: 'scss/.scss-lint.yml',
|
|
|
reporterOutput: null
|
|
|
},
|
|
|
- src: ['scss/*.scss', '!scss/_normalize.scss']
|
|
|
- },
|
|
|
-
|
|
|
- postcss: {
|
|
|
core: {
|
|
|
- options: {
|
|
|
- map: true,
|
|
|
- processors: [
|
|
|
- mq4HoverShim.postprocessorFor({ hoverSelectorPrefix: '.bs-true-hover ' }),
|
|
|
- autoprefixer
|
|
|
- ]
|
|
|
- },
|
|
|
- src: 'dist/css/*.css'
|
|
|
+ src: ['scss/*.scss', '!scss/_normalize.scss']
|
|
|
},
|
|
|
docs: {
|
|
|
- options: {
|
|
|
- processors: [
|
|
|
- autoprefixer
|
|
|
- ]
|
|
|
- },
|
|
|
- src: 'docs/assets/css/docs.min.css'
|
|
|
- },
|
|
|
- examples: {
|
|
|
- options: {
|
|
|
- processors: [
|
|
|
- autoprefixer
|
|
|
- ]
|
|
|
- },
|
|
|
- expand: true,
|
|
|
- cwd: 'docs/examples/',
|
|
|
- src: ['**/*.css'],
|
|
|
- dest: 'docs/examples/'
|
|
|
+ src: ['docs/assets/scss/*.scss', '!docs/assets/scss/docs.scss']
|
|
|
}
|
|
|
},
|
|
|
|
|
|
cssmin: {
|
|
|
options: {
|
|
|
- // TODO: disable `zeroUnits` optimization once clean-css 3.2 is released
|
|
|
- // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
|
|
|
- compatibility: 'ie9',
|
|
|
- keepSpecialComments: '*',
|
|
|
+ compatibility: 'ie9,-properties.zeroUnits',
|
|
|
sourceMap: true,
|
|
|
+ // sourceMapInlineSources: true,
|
|
|
advanced: false
|
|
|
},
|
|
|
core: {
|
|
@@ -298,30 +180,15 @@ module.exports = function (grunt) {
|
|
|
]
|
|
|
},
|
|
|
docs: {
|
|
|
- src: 'docs/assets/css/docs.min.css',
|
|
|
- dest: 'docs/assets/css/docs.min.css'
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
- csscomb: {
|
|
|
- options: {
|
|
|
- config: 'scss/.csscomb.json'
|
|
|
- },
|
|
|
- dist: {
|
|
|
- expand: true,
|
|
|
- cwd: 'dist/css/',
|
|
|
- src: ['*.css', '!*.min.css'],
|
|
|
- dest: 'dist/css/'
|
|
|
- },
|
|
|
- examples: {
|
|
|
- expand: true,
|
|
|
- cwd: 'docs/examples/',
|
|
|
- src: '**/*.css',
|
|
|
- dest: 'docs/examples/'
|
|
|
- },
|
|
|
- docs: {
|
|
|
- src: 'docs/assets/css/src/docs.css',
|
|
|
- dest: 'docs/assets/css/src/docs.css'
|
|
|
+ files: [
|
|
|
+ {
|
|
|
+ expand: true,
|
|
|
+ cwd: 'docs/assets/css',
|
|
|
+ src: ['*.css', '!*.min.css'],
|
|
|
+ dest: 'docs/assets/css',
|
|
|
+ ext: '.min.css'
|
|
|
+ }
|
|
|
+ ]
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -362,12 +229,18 @@ module.exports = function (grunt) {
|
|
|
htmllint: {
|
|
|
options: {
|
|
|
ignore: [
|
|
|
- 'Element “img” is missing required attribute “src”.',
|
|
|
- 'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
|
|
|
+ 'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “hidden”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
|
|
|
'Attribute “autocomplete” not allowed on element “button” at this point.',
|
|
|
- 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
|
|
|
'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).',
|
|
|
- 'The “datetime” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.'
|
|
|
+ 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
|
|
|
+ 'Element “img” is missing required attribute “src”.',
|
|
|
+ 'The “color” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “date” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “datetime” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “datetime-local” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “month” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “time” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
|
|
|
+ 'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.'
|
|
|
]
|
|
|
},
|
|
|
src: ['_gh_pages/**/*.html', 'js/tests/visual/*.html']
|
|
@@ -375,7 +248,7 @@ module.exports = function (grunt) {
|
|
|
|
|
|
watch: {
|
|
|
src: {
|
|
|
- files: '<%= jscs.core.src %>',
|
|
|
+ files: '<%= concat.bootstrap.src %>',
|
|
|
tasks: ['babel:dev']
|
|
|
},
|
|
|
sass: {
|
|
@@ -402,8 +275,17 @@ module.exports = function (grunt) {
|
|
|
},
|
|
|
|
|
|
exec: {
|
|
|
- npmUpdate: {
|
|
|
- command: 'npm update'
|
|
|
+ postcss: {
|
|
|
+ command: 'npm run postcss'
|
|
|
+ },
|
|
|
+ 'postcss-docs': {
|
|
|
+ command: 'npm run postcss-docs'
|
|
|
+ },
|
|
|
+ htmlhint: {
|
|
|
+ command: 'npm run htmlhint'
|
|
|
+ },
|
|
|
+ 'upload-preview': {
|
|
|
+ command: './grunt/upload-preview.sh'
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -451,7 +333,7 @@ module.exports = function (grunt) {
|
|
|
require('time-grunt')(grunt);
|
|
|
|
|
|
// Docs HTML validation task
|
|
|
- grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']);
|
|
|
+ grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint', 'exec:htmlhint']);
|
|
|
|
|
|
var runSubset = function (subset) {
|
|
|
return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;
|
|
@@ -466,7 +348,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') &&
|
|
@@ -478,20 +360,20 @@ module.exports = function (grunt) {
|
|
|
// Only run Sauce Labs tests if there's a Sauce access key
|
|
|
if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined' &&
|
|
|
// Skip Sauce if running a different subset of the test suite
|
|
|
- runSubset('sauce-js-unit') &&
|
|
|
- // Skip Sauce on Travis when [skip sauce] is in the commit message
|
|
|
- isUndefOrNonZero(process.env.TWBS_DO_SAUCE)) {
|
|
|
- testSubtasks.push('babel:dev');
|
|
|
- testSubtasks.push('connect');
|
|
|
- testSubtasks.push('saucelabs-qunit');
|
|
|
+ runSubset('sauce-js-unit')) {
|
|
|
+ testSubtasks = testSubtasks.concat(['dist', 'docs-css', 'docs-js', 'clean:docs', 'copy:docs', 'exec:upload-preview']);
|
|
|
+ // Skip Sauce on Travis when [skip sauce] is in the commit message
|
|
|
+ if (isUndefOrNonZero(process.env.TWBS_DO_SAUCE)) {
|
|
|
+ testSubtasks.push('connect');
|
|
|
+ testSubtasks.push('saucelabs-qunit');
|
|
|
+ }
|
|
|
}
|
|
|
grunt.registerTask('test', testSubtasks);
|
|
|
- grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
|
|
|
|
|
|
// JS distribution task.
|
|
|
- grunt.registerTask('dist-js', ['babel:dev', 'concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
|
|
|
+ grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core']);
|
|
|
|
|
|
- grunt.registerTask('test-scss', ['scsslint']);
|
|
|
+ grunt.registerTask('test-scss', ['scsslint:core']);
|
|
|
|
|
|
// CSS distribution task.
|
|
|
// Supported Compilers: sass (Ruby) and libsass.
|
|
@@ -499,9 +381,9 @@ module.exports = function (grunt) {
|
|
|
require('./grunt/bs-sass-compile/' + sassCompilerName + '.js')(grunt);
|
|
|
})(process.env.TWBS_SASS || 'libsass');
|
|
|
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
|
|
|
- grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);
|
|
|
+ grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
|
|
|
|
|
|
- grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
|
|
|
+ grunt.registerTask('dist-css', ['sass-compile', 'exec:postcss', 'cssmin:core', 'cssmin:docs']);
|
|
|
|
|
|
// Full distribution task.
|
|
|
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
|
|
@@ -509,41 +391,15 @@ 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', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
|
|
|
+ grunt.registerTask('docs-css', ['cssmin:docs', 'exec:postcss-docs']);
|
|
|
+ grunt.registerTask('lint-docs-css', ['scsslint:docs']);
|
|
|
grunt.registerTask('docs-js', ['uglify:docsJs']);
|
|
|
- grunt.registerTask('lint-docs-js', ['jscs:assets']);
|
|
|
- grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);
|
|
|
- grunt.registerTask('docs-github', ['jekyll:github', 'htmlmin']);
|
|
|
+ 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']);
|
|
|
|
|
|
// Publish to GitHub
|
|
|
grunt.registerTask('publish', ['buildcontrol:pages']);
|
|
|
-
|
|
|
- // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
|
|
|
- // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
|
|
|
- grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', '_update-shrinkwrap']);
|
|
|
- grunt.registerTask('_update-shrinkwrap', function () {
|
|
|
- var done = this.async();
|
|
|
- npmShrinkwrap({ dev: true, dirname: __dirname }, function (err) {
|
|
|
- if (err) {
|
|
|
- grunt.fail.warn(err);
|
|
|
- }
|
|
|
- var dest = 'grunt/npm-shrinkwrap.json';
|
|
|
- fs.renameSync('npm-shrinkwrap.json', dest);
|
|
|
- grunt.log.writeln('File ' + dest.cyan + ' updated.');
|
|
|
- done();
|
|
|
- });
|
|
|
- });
|
|
|
};
|