Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update devDependencies, adjust .jshintrc to jsHint 2.x, use .jshintig…

…nore. Close gh-1283.
  • Loading branch information...
commit c33108cad16ba6ff831d5cbc45b9dfbf12650e0e 1 parent bc4e976
@mzgol mzgol authored timmywil committed
View
7 .jshintignore
@@ -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
View
12 Gruntfile.js
@@ -15,7 +15,8 @@ module.exports = function( grunt ) {
} catch(e) {}
return data;
},
- srcHintOptions = readOptionalJSON("src/.jshintrc");
+ fs = require( "fs" ),
+ srcHintOptions = readOptionalJSON( "src/.jshintrc" );
// The concatenated file won't pass onevar
// But our modules can
@@ -85,9 +86,7 @@ module.exports = function( grunt ) {
}
},
tests: {
- // TODO: Once .jshintignore is supported, use that instead.
- // issue located here: https://github.com/gruntjs/grunt-contrib-jshint/issues/1
- src: [ "test/data/{test,testinit,testrunner}.js", "test/unit/**/*.js" ],
+ src: [ "test/**/*.js" ],
options: {
jshintrc: "test/.jshintrc"
}
@@ -453,7 +452,7 @@ module.exports = function( grunt ) {
// Process files for distribution
grunt.registerTask( "dist", function() {
- var stored, flags, paths, fs, nonascii;
+ var stored, flags, paths, nonascii;
// Check for stored destination paths
// ( set in dist/.destination.json )
@@ -468,7 +467,6 @@ module.exports = function( grunt ) {
});
// Ensure the dist files are pure ASCII
- fs = require( "fs" );
nonascii = false;
distpaths.forEach(function( filename ) {
@@ -559,8 +557,6 @@ module.exports = function( grunt ) {
// The problem is caused by the pre-uglify task.
// Also, remove temporary files.
grunt.registerMultiTask( "post-uglify", function() {
- var fs = require( "fs" );
-
this.files.forEach(function( mapping ) {
var mapFileName = mapping.src[ 0 ];
View
8 package.json
@@ -23,15 +23,15 @@
],
"dependencies": {},
"devDependencies": {
- "grunt": "0.4.1",
+ "grunt": "~0.4.1",
"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-jshint": "~0.6.0",
"grunt-contrib-uglify": "~0.2.2",
- "gzip-js": "0.3.1",
+ "gzip-js": "0.3.2",
"testswarm": "~1.1.0",
- "archiver": "~0.4.2"
+ "archiver": "~0.4.6"
},
"keywords": []
}
View
1  src/.jshintrc
@@ -16,7 +16,6 @@
"sub": true,
"browser": true,
- "es5": true,
"globals": {
"jQuery": true,
View
3  test/.jshintignore
@@ -1,3 +0,0 @@
-qunit/
-data/badjson.js
-data/jquery-1.9.1.ajax_xhr.min.js
View
47 test/.jshintrc
@@ -21,32 +21,33 @@
"wsh": true,
"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,
- "QUnit": true,
"module": true,
- "ok": true,
- "equal": 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,
"fireNative": true,
"Globals": true,
Please sign in to comment.
Something went wrong with that request. Please try again.