Merge pull request #19995 from twbs/eslint-1.10.3

Upgrade ESLint to v1.10.3

.hound.yml

@@ -10,7 +10,7 @@ javascript:
 
 eslint:
   enabled: true
-  config_file: js/.eslintrc
+  config_file: js/.eslintrc.json
 
 jscs:
   enabled: true

grunt/npm-shrinkwrap.json

@@ -824,9 +824,9 @@
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
     },
     "eslint": {
-      "version": "1.9.0",
-      "from": "eslint@1.9.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.9.0.tgz",
+      "version": "1.10.3",
+      "from": "eslint@1.10.3",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz",
       "dependencies": {
         "argparse": {
           "version": "1.0.7",
@@ -844,9 +844,9 @@
           "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
         },
         "js-yaml": {
-          "version": "3.6.1",
-          "from": "js-yaml@>=3.2.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",
+          "version": "3.4.5",
+          "from": "js-yaml@3.4.5",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz",
           "dependencies": {
             "esprima": {
               "version": "2.7.2",

package.json

@@ -17,7 +17,7 @@
   "scripts": {
     "change-version": "node grunt/change-version.js",
     "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
-    "eslint": "eslint --config js/.eslintrc js/src",
+    "eslint": "eslint --config js/.eslintrc.json js/src",
     "test": "npm run eslint && grunt test"
   },
   "style": "dist/css/bootstrap.css",
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^4.1.3",
-    "eslint": "^1.9.0",
+    "eslint": "^1.10.3",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",