Merge pull request #272 from twbs/bump-eslint

Bump grunt-eslint to ^10.0.0

.eslintrc

@@ -34,6 +34,7 @@
         "no-trailing-spaces": 2,
         "no-underscore-dangle": 0,
         "no-void": 2,
+        "one-var": [2, "never"],
         "operator-assignment": [2, "always"],
         "padded-blocks": 0,
         "quotes": 0,

package.json

@@ -42,7 +42,7 @@
     "grunt-contrib-nodeunit": "^0.4.1",
     "grunt-contrib-qunit": "^0.7.0",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-eslint": "^9.0.0",
+    "grunt-eslint": "^10.0.0",
     "grunt-exec": "^0.4.6",
     "grunt-jscs": "^1.5.0",
     "jquery": "~2.1.3",

src/bootlint.js

@@ -199,6 +199,7 @@ var LocationIndex = _location.LocationIndex;
         }
         catch (e) {
             // deliberately do nothing
+            // empty
         }
 
         return theWindow;
@@ -447,6 +448,7 @@ var LocationIndex = _location.LocationIndex;
         }
         catch (e) {
             // deliberately do nothing
+            // empty
         }
         /* @covignore */
         if (theWindow) {
@@ -459,6 +461,7 @@ var LocationIndex = _location.LocationIndex;
                 }
                 catch (e) {
                     // skip; not actually jQuery?
+                    // empty
                 }
                 if (globalVersion) {
                     // pad out short version numbers (e.g. '1.7')
@@ -472,6 +475,7 @@ var LocationIndex = _location.LocationIndex;
                     }
                     catch (e) {
                         // invalid version number
+                        // empty
                     }
                     if (upToDate === false) {
                         reporter(OLD_JQUERY);

test-infra/npm-shrinkwrap.json

@@ -1334,6 +1334,52 @@
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
             },
+            "glob": {
+              "version": "4.5.3",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
             "has": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/has/-/has-1.0.0.tgz"
@@ -2813,8 +2859,8 @@
       }
     },
     "grunt-eslint": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-9.0.0.tgz",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-10.0.0.tgz",
       "dependencies": {
         "chalk": {
           "version": "0.5.1",
@@ -2855,8 +2901,8 @@
           }
         },
         "eslint": {
-          "version": "0.17.1",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-0.17.1.tgz",
+          "version": "0.18.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-0.18.0.tgz",
           "dependencies": {
             "chalk": {
               "version": "0.5.1",
@@ -3746,6 +3792,52 @@
                 }
               }
             },
+            "glob": {
+              "version": "4.5.3",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.4",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
             "inherits": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"