Merge pull request #4858 from zpao/eslint-1.4

Upgrade eslint to 1.4.1
This commit is contained in:
Paul O’Shannessy committed 2015-09-16 12:35:12 -07:00
commit f9bbc06960
4 files changed
+9 -5

No files matched your search

+5 -1
View File
@@ -19,14 +19,19 @@ rules:
dot-notation: 2
eol-last: 2
indent: [2, 2, {SwitchCase: 1}]
jsx-quotes: [2, prefer-double]
no-bitwise: 0
no-dupe-class-members: 2
no-multi-spaces: 2
no-restricted-syntax: [2, WithStatement]
no-shadow: 2
no-unused-expressions: 2
no-unused-vars: [2, {args: none}]
quotes: [2, single, avoid-escape]
space-after-keywords: 2
space-before-blocks: 2
# TODO: enable this rule after https://github.com/eslint/eslint/pull/3768 lands
space-before-keywords: 0
strict: [2, global]
# JSX
@@ -34,7 +39,6 @@ rules:
react/display-name: 0
react/jsx-boolean-value: [2, always]
react/jsx-no-undef: 2
react/jsx-quotes: [2, double]
# We don't care to do this
react/jsx-sort-prop-types: 0
react/jsx-sort-props: 0
+2 -2
View File
@@ -12,8 +12,8 @@
"del": "^1.2.0",
"derequire": "^2.0.0",
"envify": "^3.0.0",
"eslint": "^1.1.0",
"eslint-plugin-react": "^3.2.1",
"eslint": "^1.4.3",
"eslint-plugin-react": "^3.4.0",
"eslint-plugin-react-internal": "file:eslint-rules",
"fbjs": "^0.2.0",
"fbjs-scripts": "^0.2.0",
@@ -25,7 +25,7 @@ describe('ReactMount', function() {
if (WebComponents === undefined && typeof jest !== 'undefined') {
WebComponents = require('WebComponents');
}
} catch(e) {
} catch (e) {
// Parse error expected on engines that don't support setters
// or otherwise aren't supportable by the polyfill.
// Leave WebComponents undefined.
+1 -1
View File
@@ -26,7 +26,7 @@ var ReactErrorUtils = {
invokeGuardedCallback: function(name, func, a, b) {
try {
return func(a, b);
} catch(x) {
} catch (x) {
if (caughtError === null) {
caughtError = x;
}