From fc44dc1a6608594be53e7c28c81ee81887c9cf7f Mon Sep 17 00:00:00 2001 From: Micah Miller Date: Sat, 26 Jan 2019 15:48:07 -0500 Subject: [PATCH] Build: Update to latest version of Grunt & many other packages JSHint, JSCS & QUnit-related packages are not updated as they need more code adjustments. Closes gh-15112 --- .csslintrc | 1 + Gruntfile.js | 14 +++++++----- package.json | 29 +++++++++++++------------ tests/visual/menu/menu.html | 2 +- tests/visual/selectmenu/selectmenu.html | 2 +- tests/visual/slider/range_slider.html | 4 ++-- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.csslintrc b/.csslintrc index 4273f5cc65f..227cda5158b 100644 --- a/.csslintrc +++ b/.csslintrc @@ -7,6 +7,7 @@ "import": false, "important": false, "outline-none": false, + "order-alphabetical": false, "overqualified-elements": false, "text-indent": false } diff --git a/Gruntfile.js b/Gruntfile.js index 75004eb5862..d472eaeef38 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,6 +3,7 @@ module.exports = function( grunt ) { "use strict"; var + glob = require( "glob" ), // files coreFiles = [ @@ -93,7 +94,7 @@ function mapMinFile( file ) { } function expandFiles( files ) { - return grunt.util._.pluck( grunt.file.expandMapping( files ), "src" ).map( function( values ) { + return grunt.util._.map( grunt.file.expandMapping( files ), "src" ).map( function( values ) { return values[ 0 ]; } ); } @@ -133,7 +134,7 @@ function createBanner( files ) { "<%= pkg.homepage ? '* ' + pkg.homepage + '\\n' : '' %>" + ( files ? "* Includes: " + fileNames.join( ", " ) + "\n" : "" ) + "* Copyright <%= pkg.author.name %>;" + - " Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n"; + " Licensed <%= _.map(pkg.licenses, 'type').join(', ') %> */\n"; } grunt.initConfig( { @@ -202,9 +203,9 @@ grunt.initConfig( { ignore: [ /The text content of element “script” was not in the required format: Expected space, tab, newline, or slash but found “.” instead/ ] }, - src: [ "demos/**/*.html", "tests/**/*.html" ].concat( htmllintBad.map( function( file ) { - return "!" + file; - } ) ) + src: glob.sync("{demos,tests}/**/*.html", { + ignore: htmllintBad + } ) }, bad: { options: { @@ -212,7 +213,8 @@ grunt.initConfig( { /Start tag seen without seeing a doctype first/, /Element “head” is missing a required instance of child element “title”/, /Element “object” is missing one or more of the following/, - /The “codebase” attribute on the “object” element is obsolete/ + /The “codebase” attribute on the “object” element is obsolete/, + /Consider adding a “lang” attribute to the “html” start tag/ ] }, src: htmllintBad diff --git a/package.json b/package.json index 5a801a84888..079500db6e5 100644 --- a/package.json +++ b/package.json @@ -49,23 +49,24 @@ "jquery": ">=1.8.0 <4.0.0" }, "devDependencies": { - "commitplease": "2.3.0", - "grunt": "0.4.5", - "grunt-bowercopy": "1.2.4", - "grunt-cli": "0.1.13", - "grunt-compare-size": "0.4.0", - "grunt-contrib-concat": "0.5.1", - "grunt-contrib-csslint": "0.5.0", + "commitplease": "3.2.0", + "glob": "7.1.6", + "grunt": "1.3.0", + "grunt-bowercopy": "1.2.5", + "grunt-cli": "1.3.2", + "grunt-compare-size": "0.4.2", + "grunt-contrib-concat": "1.0.1", + "grunt-contrib-csslint": "2.0.0", "grunt-contrib-jshint": "0.12.0", "grunt-contrib-qunit": "1.0.1", - "grunt-contrib-requirejs": "0.4.4", - "grunt-contrib-uglify": "0.11.1", - "grunt-git-authors": "3.1.0", - "grunt-html": "6.0.0", + "grunt-contrib-requirejs": "1.0.0", + "grunt-contrib-uglify": "5.0.0", + "grunt-git-authors": "3.2.0", + "grunt-html": "14.2.0", "grunt-jscs": "2.1.0", - "load-grunt-tasks": "3.4.0", - "rimraf": "2.5.1", - "testswarm": "1.1.0" + "load-grunt-tasks": "5.1.0", + "rimraf": "3.0.2", + "testswarm": "1.1.2" }, "keywords": [] } diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index 9bbaa95e1f4..97ecdb4dfbb 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -1,5 +1,5 @@ - + diff --git a/tests/visual/selectmenu/selectmenu.html b/tests/visual/selectmenu/selectmenu.html index 0dbfc3882ad..1e67beeb9c2 100644 --- a/tests/visual/selectmenu/selectmenu.html +++ b/tests/visual/selectmenu/selectmenu.html @@ -1,5 +1,5 @@ - + diff --git a/tests/visual/slider/range_slider.html b/tests/visual/slider/range_slider.html index 64152a9ff3d..ad756ffde80 100644 --- a/tests/visual/slider/range_slider.html +++ b/tests/visual/slider/range_slider.html @@ -1,6 +1,6 @@ - - + +