Update devDependencies, adjust .jshintrc to jsHint 2.x, use .jshintignore. Close...

diff --git a/.jshintignore b/.jshintignore
new file mode 100644 (file)
index 0000000..6c1c770
--- /dev/null
+++ b/.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

diff --git a/Gruntfile.js b/Gruntfile.js
index 0e782ff4b33bd98fb0af0e4d8c1357b2d55ad4a1..adc3b738474212aa4a05381b221bb40631d9a7c8 100644 (file)
--- a/Gruntfile.js
+++ b/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 ];
 

diff --git a/package.json b/package.json
index 2ae795396e13bcff69ae048ae96746a76df9d941..b98eb051b38ddddc71ee91070d3c97a4bd12cee1 100644 (file)
--- a/package.json
+++ b/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": []
 }

diff --git a/src/.jshintrc b/src/.jshintrc
index c61a8325df3dcb73268ef3823ee2d6e1b9109296..ba16cd5db47157930be7af51fcac5c8c22f7ab8d 100644 (file)
--- a/src/.jshintrc
+++ b/src/.jshintrc
@@ -16,7 +16,6 @@
        "sub": true,
 
        "browser": true,
-       "es5": true,
 
        "globals": {
                "jQuery": true,

diff --git a/test/.jshintignore b/test/.jshintignore
deleted file mode 100644 (file)
index 8f2ed18..0000000
--- a/test/.jshintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-qunit/
-data/badjson.js
-data/jquery-1.9.1.ajax_xhr.min.js

diff --git a/test/.jshintrc b/test/.jshintrc
index f92ff88cd7b3b79b8a160ab47bbed42616c0c841..75c50eeeb717e05b00a7ba65dcb3b18898495cef 100644 (file)
--- a/test/.jshintrc
+++ b/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,