diff options
author | Bardi Harborow <bardi@bardiharborow.com> | 2016-10-06 16:21:05 +0300 |
---|---|---|
committer | Bardi Harborow <bardi@bardiharborow.com> | 2016-10-09 04:15:17 +0300 |
commit | d57d5a606b7a7b26b04e9315cca35287758b66c0 (patch) | |
tree | c67d47d80e940648a3a4d3a0a302ab0138b04f0e /Gruntfile.js | |
parent | e56146e592804ca2a9a3b37a2d87c1f7eff54676 (diff) |
Update dependencies, including Babel to v6 and zeroUnits fix.
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 75ad827f39..bde873a78e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -58,8 +58,7 @@ module.exports = function (grunt) { babel: { dev: { options: { - sourceMap: true, - modules: 'ignore' + sourceMap: true }, files: { 'js/dist/util.js' : 'js/src/util.js', @@ -77,7 +76,7 @@ module.exports = function (grunt) { }, dist: { options: { - modules: 'ignore' + extends: '../../js/.babelrc' }, files: { '<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>' @@ -87,8 +86,8 @@ module.exports = function (grunt) { 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: { @@ -102,8 +101,7 @@ module.exports = function (grunt) { // Custom function to remove all export and import statements process: function (src) { return src.replace(/^(export|import).*/gm, ''); - }, - stripBanners: false + } }, bootstrap: { src: [ @@ -165,10 +163,7 @@ module.exports = function (grunt) { 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 |