mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Update devDependencies, adjust .jshintrc to jsHint 2.x, use .jshintignore. Close gh-1283.
This commit is contained in:
parent
bc4e9763e2
commit
c33108cad1
7
.jshintignore
Normal file
7
.jshintignore
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
test/qunit/**
|
||||||
|
test/data/jquery-1.9.1.ajax_xhr.min.js
|
||||||
|
test/data/badcall.js
|
||||||
|
test/data/badjson.js
|
||||||
|
test/data/json_obj.js
|
||||||
|
test/data/readywaitasset.js
|
||||||
|
test/data/readywaitloader.js
|
12
Gruntfile.js
12
Gruntfile.js
@ -15,7 +15,8 @@ module.exports = function( grunt ) {
|
|||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
srcHintOptions = readOptionalJSON("src/.jshintrc");
|
fs = require( "fs" ),
|
||||||
|
srcHintOptions = readOptionalJSON( "src/.jshintrc" );
|
||||||
|
|
||||||
// The concatenated file won't pass onevar
|
// The concatenated file won't pass onevar
|
||||||
// But our modules can
|
// But our modules can
|
||||||
@ -85,9 +86,7 @@ module.exports = function( grunt ) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
tests: {
|
tests: {
|
||||||
// TODO: Once .jshintignore is supported, use that instead.
|
src: [ "test/**/*.js" ],
|
||||||
// issue located here: https://github.com/gruntjs/grunt-contrib-jshint/issues/1
|
|
||||||
src: [ "test/data/{test,testinit,testrunner}.js", "test/unit/**/*.js" ],
|
|
||||||
options: {
|
options: {
|
||||||
jshintrc: "test/.jshintrc"
|
jshintrc: "test/.jshintrc"
|
||||||
}
|
}
|
||||||
@ -453,7 +452,7 @@ module.exports = function( grunt ) {
|
|||||||
|
|
||||||
// Process files for distribution
|
// Process files for distribution
|
||||||
grunt.registerTask( "dist", function() {
|
grunt.registerTask( "dist", function() {
|
||||||
var stored, flags, paths, fs, nonascii;
|
var stored, flags, paths, nonascii;
|
||||||
|
|
||||||
// Check for stored destination paths
|
// Check for stored destination paths
|
||||||
// ( set in dist/.destination.json )
|
// ( set in dist/.destination.json )
|
||||||
@ -468,7 +467,6 @@ module.exports = function( grunt ) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Ensure the dist files are pure ASCII
|
// Ensure the dist files are pure ASCII
|
||||||
fs = require( "fs" );
|
|
||||||
nonascii = false;
|
nonascii = false;
|
||||||
|
|
||||||
distpaths.forEach(function( filename ) {
|
distpaths.forEach(function( filename ) {
|
||||||
@ -559,8 +557,6 @@ module.exports = function( grunt ) {
|
|||||||
// The problem is caused by the pre-uglify task.
|
// The problem is caused by the pre-uglify task.
|
||||||
// Also, remove temporary files.
|
// Also, remove temporary files.
|
||||||
grunt.registerMultiTask( "post-uglify", function() {
|
grunt.registerMultiTask( "post-uglify", function() {
|
||||||
var fs = require( "fs" );
|
|
||||||
|
|
||||||
this.files.forEach(function( mapping ) {
|
this.files.forEach(function( mapping ) {
|
||||||
var mapFileName = mapping.src[ 0 ];
|
var mapFileName = mapping.src[ 0 ];
|
||||||
|
|
||||||
|
@ -23,15 +23,15 @@
|
|||||||
],
|
],
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt": "0.4.1",
|
"grunt": "~0.4.1",
|
||||||
"grunt-compare-size": "~0.4.0",
|
"grunt-compare-size": "~0.4.0",
|
||||||
"grunt-git-authors": "1.2.0",
|
"grunt-git-authors": "~1.2.0",
|
||||||
"grunt-contrib-watch": "~0.4.4",
|
"grunt-contrib-watch": "~0.4.4",
|
||||||
"grunt-contrib-jshint": "~0.6.0",
|
"grunt-contrib-jshint": "~0.6.0",
|
||||||
"grunt-contrib-uglify": "~0.2.2",
|
"grunt-contrib-uglify": "~0.2.2",
|
||||||
"gzip-js": "0.3.1",
|
"gzip-js": "0.3.2",
|
||||||
"testswarm": "~1.1.0",
|
"testswarm": "~1.1.0",
|
||||||
"archiver": "~0.4.2"
|
"archiver": "~0.4.6"
|
||||||
},
|
},
|
||||||
"keywords": []
|
"keywords": []
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
"sub": true,
|
"sub": true,
|
||||||
|
|
||||||
"browser": true,
|
"browser": true,
|
||||||
"es5": true,
|
|
||||||
|
|
||||||
"globals": {
|
"globals": {
|
||||||
"jQuery": true,
|
"jQuery": true,
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
qunit/
|
|
||||||
data/badjson.js
|
|
||||||
data/jquery-1.9.1.ajax_xhr.min.js
|
|
@ -21,32 +21,33 @@
|
|||||||
"wsh": true,
|
"wsh": true,
|
||||||
|
|
||||||
"globals": {
|
"globals": {
|
||||||
"DOMParser": true,
|
"DOMParser": false,
|
||||||
|
"QUnit": false,
|
||||||
|
"ok": false,
|
||||||
|
"equal": false,
|
||||||
|
"asyncTest": false,
|
||||||
|
"notEqual": false,
|
||||||
|
"deepEqual": false,
|
||||||
|
"strictEqual": false,
|
||||||
|
"notStrictEqual": false,
|
||||||
|
"start": false,
|
||||||
|
"stop": false,
|
||||||
|
"expect": false,
|
||||||
|
"raises": false,
|
||||||
|
"ajaxTest": false,
|
||||||
|
"testIframe": false,
|
||||||
|
"testIframeWithCallback": false,
|
||||||
|
"createDashboardXML": false,
|
||||||
|
"createXMLFragment": false,
|
||||||
|
"moduleTeardown": false,
|
||||||
|
"testFoo": false,
|
||||||
|
"url": false,
|
||||||
|
"t": false,
|
||||||
|
"q": false,
|
||||||
|
|
||||||
"jQuery": true,
|
"jQuery": true,
|
||||||
"QUnit": true,
|
|
||||||
"module": true,
|
"module": true,
|
||||||
"ok": true,
|
|
||||||
"equal": true,
|
|
||||||
"test": true,
|
"test": true,
|
||||||
"asyncTest": true,
|
|
||||||
"notEqual": true,
|
|
||||||
"deepEqual": true,
|
|
||||||
"strictEqual": true,
|
|
||||||
"notStrictEqual": true,
|
|
||||||
"start": true,
|
|
||||||
"stop": true,
|
|
||||||
"expect": true,
|
|
||||||
"raises": true,
|
|
||||||
"ajaxTest": true,
|
|
||||||
"testIframe": true,
|
|
||||||
"testIframeWithCallback": true,
|
|
||||||
"createDashboardXML": true,
|
|
||||||
"createXMLFragment": true,
|
|
||||||
"moduleTeardown": true,
|
|
||||||
"testFoo": true,
|
|
||||||
"url": true,
|
|
||||||
"t": true,
|
|
||||||
"q": true,
|
|
||||||
"amdDefined": true,
|
"amdDefined": true,
|
||||||
"fireNative": true,
|
"fireNative": true,
|
||||||
"Globals": true,
|
"Globals": true,
|
||||||
|
Loading…
Reference in New Issue
Block a user