From 166daf498a51a42fa2c1c8dd02aaf7678d9987c2 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@chrisrebert.com>
Date: Tue, 31 May 2016 01:27:01 -0700
Subject: [PATCH] Upgrade ESLint to v2.2.0 (#20000)
[skip sauce]
[skip validator]
---
grunt/npm-shrinkwrap.json | 47 +++++++++++++++++++++++++++++++--------
package.json | 2 +-
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index e9de0e1304..e3b0b11525 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -457,6 +457,16 @@
"from": "bytes@2.2.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz"
},
+ "caller-path": {
+ "version": "0.1.0",
+ "from": "caller-path@>=0.1.0 <0.2.0",
+ "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"
+ },
+ "callsites": {
+ "version": "0.2.0",
+ "from": "callsites@>=0.2.0 <0.3.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"
+ },
"camelcase": {
"version": "1.2.1",
"from": "camelcase@>=1.2.1 <2.0.0",
@@ -536,9 +546,9 @@
}
},
"cli-width": {
- "version": "1.1.1",
- "from": "cli-width@>=1.0.1 <2.0.0",
- "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"
+ "version": "2.1.0",
+ "from": "cli-width@>=2.0.0 <3.0.0",
+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz"
},
"cliui": {
"version": "2.1.0",
@@ -906,9 +916,9 @@
"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
},
"eslint": {
- "version": "2.0.0",
- "from": "eslint@2.0.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.0.0.tgz",
+ "version": "2.2.0",
+ "from": "eslint@2.2.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.2.0.tgz",
"dependencies": {
"argparse": {
"version": "1.0.7",
@@ -1766,9 +1776,16 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"inquirer": {
- "version": "0.11.4",
- "from": "inquirer@>=0.11.0 <0.12.0",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"
+ "version": "0.12.0",
+ "from": "inquirer@>=0.12.0 <0.13.0",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+ "dependencies": {
+ "lodash": {
+ "version": "4.13.1",
+ "from": "lodash@^4.3.0",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+ }
+ }
},
"invariant": {
"version": "2.2.1",
@@ -2934,6 +2951,18 @@
}
}
},
+ "require-uncached": {
+ "version": "1.0.2",
+ "from": "require-uncached@>=1.0.2 <2.0.0",
+ "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz",
+ "dependencies": {
+ "resolve-from": {
+ "version": "1.0.1",
+ "from": "resolve-from@>=1.0.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"
+ }
+ }
+ },
"reserved-words": {
"version": "0.1.1",
"from": "reserved-words@>=0.1.1 <0.2.0",
diff --git a/package.json b/package.json
index b87705106a..5afbef6293 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^6.0.4",
- "eslint": "^2.0.0",
+ "eslint": "^2.2.0",
"grunt": "^0.4.5",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0",
--
GitLab