Skip to content

Commit a22361d

Browse files
daedalus-codesmgol
daedalus-codes
authored and
mgol
committed
Build: Update to the latest version of Grunt & many other packages
JSHint, JSCS & QUnit-related packages are not updated as they need more code adjustments. Fixes #15112 Closes gh-1882
1 parent f5d38e2 commit a22361d

File tree

6 files changed

+28
-24
lines changed

6 files changed

+28
-24
lines changed

‎.csslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"import": false,
88
"important": false,
99
"outline-none": false,
10+
"order-alphabetical": false,
1011
"overqualified-elements": false,
1112
"text-indent": false
1213
}

‎Gruntfile.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module.exports = function( grunt ) {
33
"use strict";
44

55
var
6+
glob = require( "glob" ),
67

78
// files
89
coreFiles = [
@@ -93,7 +94,7 @@ function mapMinFile( file ) {
9394
}
9495

9596
function expandFiles( files ) {
96-
return grunt.util._.pluck( grunt.file.expandMapping( files ), "src" ).map( function( values ) {
97+
return grunt.util._.map( grunt.file.expandMapping( files ), "src" ).map( function( values ) {
9798
return values[ 0 ];
9899
} );
99100
}
@@ -133,7 +134,7 @@ function createBanner( files ) {
133134
"<%= pkg.homepage ? '* ' + pkg.homepage + '\\n' : '' %>" +
134135
( files ? "* Includes: " + fileNames.join( ", " ) + "\n" : "" ) +
135136
"* Copyright <%= pkg.author.name %>;" +
136-
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n";
137+
" Licensed <%= _.map(pkg.licenses, 'type').join(', ') %> */\n";
137138
}
138139

139140
grunt.initConfig( {
@@ -202,17 +203,18 @@ grunt.initConfig( {
202203
ignore: [
203204
/The text content of element “script” was not in the required format: Expected space, tab, newline, or slash but found “.” instead/
204205
] },
205-
src: [ "demos/**/*.html", "tests/**/*.html" ].concat( htmllintBad.map( function( file ) {
206-
return "!" + file;
207-
} ) )
206+
src: glob.sync("{demos,tests}/**/*.html", {
207+
ignore: htmllintBad
208+
} )
208209
},
209210
bad: {
210211
options: {
211212
ignore: [
212213
/Start tag seen without seeing a doctype first/,
213214
/Element “head” is missing a required instance of child element “title”/,
214215
/Element “object” is missing one or more of the following/,
215-
/The “codebase” attribute on the “object” element is obsolete/
216+
/The “codebase” attribute on the “object” element is obsolete/,
217+
/Consider adding a “lang” attribute to the “html” start tag/
216218
]
217219
},
218220
src: htmllintBad

‎package.json‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,24 @@
4949
"jquery": ">=1.8.0 <4.0.0"
5050
},
5151
"devDependencies": {
52-
"commitplease": "2.3.0",
53-
"grunt": "0.4.5",
54-
"grunt-bowercopy": "1.2.4",
55-
"grunt-cli": "0.1.13",
56-
"grunt-compare-size": "0.4.0",
57-
"grunt-contrib-concat": "0.5.1",
58-
"grunt-contrib-csslint": "0.5.0",
52+
"commitplease": "3.2.0",
53+
"glob": "7.1.6",
54+
"grunt": "1.3.0",
55+
"grunt-bowercopy": "1.2.5",
56+
"grunt-cli": "1.3.2",
57+
"grunt-compare-size": "0.4.2",
58+
"grunt-contrib-concat": "1.0.1",
59+
"grunt-contrib-csslint": "2.0.0",
5960
"grunt-contrib-jshint": "0.12.0",
6061
"grunt-contrib-qunit": "1.0.1",
61-
"grunt-contrib-requirejs": "0.4.4",
62-
"grunt-contrib-uglify": "0.11.1",
63-
"grunt-git-authors": "3.1.0",
64-
"grunt-html": "6.0.0",
62+
"grunt-contrib-requirejs": "1.0.0",
63+
"grunt-contrib-uglify": "5.0.0",
64+
"grunt-git-authors": "3.2.0",
65+
"grunt-html": "14.2.0",
6566
"grunt-jscs": "2.1.0",
66-
"load-grunt-tasks": "3.4.0",
67-
"rimraf": "2.5.1",
68-
"testswarm": "1.1.0"
67+
"load-grunt-tasks": "5.1.0",
68+
"rimraf": "3.0.2",
69+
"testswarm": "1.1.2"
6970
},
7071
"keywords": []
7172
}

‎tests/visual/menu/menu.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<title>Menu Visual Test: Default</title>

‎tests/visual/selectmenu/selectmenu.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<title>Selectmenu Visual Test: Default</title>

‎tests/visual/slider/range_slider.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
2-
<html>
3-
<head lang="en">
2+
<html lang="en">
3+
<head>
44
<meta charset="UTF-8">
55
<title>jQuery UI Slider - Range slider</title>
66
<link rel="stylesheet" href="../../../themes/base/all.css">

0 commit comments

Comments
 (0)