diff options
| author | Chris Rebert <[email protected]> | 2016-05-31 00:24:13 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-05-31 00:24:13 -0700 |
| commit | f7677d6be5a5465df30a50a6a8c0c733a5fa44b8 (patch) | |
| tree | d85d7e42560dec6f7ef2f98263ef3ee64dbb48d3 | |
| parent | 06b3af3c0a4ac6d1a4165b16b341b12f4389231b (diff) | |
| parent | e573f70e2c2be244d003db36abdaeda17e5b9512 (diff) | |
| download | bootstrap-f7677d6be5a5465df30a50a6a8c0c733a5fa44b8.tar.xz bootstrap-f7677d6be5a5465df30a50a6a8c0c733a5fa44b8.zip | |
Merge pull request #19995 from twbs/eslint-1.10.3
Upgrade ESLint to v1.10.3
| -rw-r--r-- | .hound.yml | 2 | ||||
| -rw-r--r-- | grunt/npm-shrinkwrap.json | 12 | ||||
| -rw-r--r-- | js/.eslintrc.json (renamed from js/.eslintrc) | 0 | ||||
| -rw-r--r-- | package.json | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.hound.yml b/.hound.yml index 8a21bdf44..4589de64b 100644 --- a/.hound.yml +++ b/.hound.yml @@ -10,7 +10,7 @@ javascript: eslint: enabled: true - config_file: js/.eslintrc + config_file: js/.eslintrc.json jscs: enabled: true diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index 4914578ff..dd4c7e397 100644 --- a/grunt/npm-shrinkwrap.json +++ b/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": "[email protected]", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.9.0.tgz", + "version": "1.10.3", + "from": "[email protected]", + "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": "[email protected]", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz", "dependencies": { "esprima": { "version": "2.7.2", diff --git a/js/.eslintrc b/js/.eslintrc.json index 619df7cb3..619df7cb3 100644 --- a/js/.eslintrc +++ b/js/.eslintrc.json diff --git a/package.json b/package.json index d358bb866..db64c2afe 100644 --- a/package.json +++ b/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", |