Skip to content

Build: Update to the latest version of Grunt & many other packages #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .csslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"import": false,
"important": false,
"outline-none": false,
"order-alphabetical": false,
"overqualified-elements": false,
"text-indent": false
}
14 changes: 8 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = function( grunt ) {
"use strict";

var
glob = require( "glob" ),

// files
coreFiles = [
Expand Down Expand Up @@ -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 ];
} );
}
Expand Down Expand Up @@ -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( {
Expand Down Expand Up @@ -202,17 +203,18 @@ 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: {
ignore: [
/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
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
2 changes: 1 addition & 1 deletion tests/visual/menu/menu.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Menu Visual Test: Default</title>
Expand Down
2 changes: 1 addition & 1 deletion tests/visual/selectmenu/selectmenu.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Selectmenu Visual Test: Default</title>
Expand Down
4 changes: 2 additions & 2 deletions tests/visual/slider/range_slider.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
<head lang="en">
<html lang="en">
<head>
<meta charset="UTF-8">
<title>jQuery UI Slider - Range slider</title>
<link rel="stylesheet" href="../../../themes/base/all.css">
Expand Down