Skip to content

Commit

Permalink
[eslint] use the airbnb config; temporarily set failing rules to warn…
Browse files Browse the repository at this point in the history
…ings
  • Loading branch information
ljharb committed May 19, 2019
1 parent d443bde commit 9dd1350
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 164 deletions.
199 changes: 45 additions & 154 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,173 +1,64 @@
{
"root": true,
"extends": "airbnb-base",
"env": {
"es6": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"jsx": true
}
"jsx": true
},
"sourceType": "script",
},
"rules": {
// Possible Errors
"comma-dangle": [2, "never"],
"computed-property-spacing": [2, "never"],
"no-cond-assign": 2,
"no-console": 2,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-dupe-keys": 2,
"no-empty": 2,
"no-empty-character-class": 2,
"no-ex-assign": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-sparse-arrays": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
// Best Practices
"block-scoped-var": 2,
"complexity": 0,
"consistent-return": 2,
"curly": 2,
"default-case": 2,
"dot-notation": 2,
"eqeqeq": 2,
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-confusing-arrow": 2,
"no-div-regex": 2,
"no-else-return": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-process-env": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-unused-expressions": 2,
"no-void": 0,
"no-warning-comments": 2,
"no-with": 2,
"prefer-arrow-callback": 2,
"radix": 2,
"vars-on-top": 0,
"wrap-iife": 2,
"yoda": 2,
// Strict Mode
"strict": [2, "global"],
// Variables
"prefer-const": 2,
"no-catch-shadow": 2,
"no-const-assign": 2,
"no-delete-var": 2,
"no-label-var": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 2,
"no-unused-vars": 2,
"no-use-before-define": 2,
"no-var": 2,
// Stylistic Issues
"indent": [2, 2, {
"SwitchCase": 1
}],
"arrow-body-style": [2, "as-needed"],
"arrow-parens": [2, "as-needed"],
"arrow-spacing": 2,
"brace-style": 2,
"camelcase": 0,
"comma-spacing": 2,
"comma-style": 2,
"consistent-this": 0,
"eol-last": 2,
"func-names": 0,
"func-style": 0,
"key-spacing": [2, {
"beforeColon": false,
"afterColon": true
}],
"max-nested-callbacks": 0,
"new-cap": 2,
"new-parens": 2,
"no-array-constructor": 2,
"no-inline-comments": 0,
"no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2,
"no-nested-ternary": 2,
"no-new-object": 2,
"semi-spacing": [2, {
"before": false,
"after": true
}],
"no-spaced-func": 2,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-multiple-empty-lines": 2,
"no-underscore-dangle": 0,
"one-var": 0,
"operator-assignment": [2, "always"],
"padded-blocks": [2, { "blocks": "never", "classes": "never", "switches": "never" }],
"quotes": [2, "single"],
"quote-props": [2, "as-needed"],
"semi": [2, "always"],
"sort-vars": [2, {"ignoreCase": true}],
"keyword-spacing": 2,
"space-before-blocks": 2,
"object-curly-spacing": [2, "never"],
"array-bracket-spacing": [2, "never"],
"space-in-parens": 2,
"space-infix-ops": 2,
"space-unary-ops": 2,
"spaced-comment": 2,
"wrap-regex": 0,
// Legacy
"max-depth": 0,
"max-len": [2, 120, {
"ignoreStrings": true,
"ignoreTemplateLiterals": true,
"ignoreComments": true,
}],
"max-params": 0,
"max-statements": 0,
"no-plusplus": 0,
"no-prototype-builtins": 2,
"prefer-template": 2,
"template-curly-spacing": [2, "never"]
}

"prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],

"object-shorthand": 1,
"space-before-function-paren": 1,
"import/order": 1,
"lines-around-directive": 1,
"no-useless-escape": 1,
"arrow-parens": 1,
"import/newline-after-import": 1,
"operator-linebreak": 1,
"function-paren-newline": 0,
"no-plusplus": 1,
"no-param-reassign": 1,
"no-else-return": 1,
"object-curly-newline": 1,
"object-property-newline": 1,
"spaced-comment": 1,
"no-case-declarations": 1,
"no-underscore-dangle": 1,
"no-mixed-operators": 1,
"semi-style": 1,
"no-void": 1,
"no-continue": 1,
"no-tabs": 1,
"global-require": 1,
"array-callback-return": 1,
"no-restricted-syntax": 1,
"implicit-arrow-linebreak": 1,
"no-useless-return": 1,
"valid-jsdoc": 1,
},
"overrides": [
{
"files": "tests/**",
"rules": {
"no-template-curly-in-string": 1,
},
},
],
}
3 changes: 2 additions & 1 deletion lib/rules/jsx-closing-bracket-location.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ module.exports = {
*/
function getIndentation(tokens, expectedLocation, correctColumn) {
correctColumn = correctColumn || 0;
let indentation, spaces = [];
let indentation;
let spaces = [];
switch (expectedLocation) {
case 'props-aligned':
indentation = /^\s*/.exec(sourceCode.lines[tokens.lastProp.firstLine - 1])[0];
Expand Down
6 changes: 3 additions & 3 deletions lib/util/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function resetWarningFlag() {
function detectReactVersion() {
try {
const reactPath = resolve.sync('react', {basedir: process.cwd()});
const react = require(reactPath);
const react = require(reactPath); // eslint-disable-line import/no-dynamic-require
return react.version;
} catch (e) {
if (!warnedForMissingVersion && e.code === 'MODULE_NOT_FOUND') {
Expand Down Expand Up @@ -54,7 +54,7 @@ function getReactVersionFromContext(context) {
function detectFlowVersion() {
try {
const flowPackageJsonPath = resolve.sync('flow-bin/package.json', {basedir: process.cwd()});
const flowPackageJson = require(flowPackageJsonPath);
const flowPackageJson = require(flowPackageJsonPath); // eslint-disable-line import/no-dynamic-require
return flowPackageJson.version;
} catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
Expand All @@ -80,7 +80,7 @@ function getFlowVersionFromContext(context) {
}
confVer = String(flowVersion);
} else {
throw 'Could not retrieve flowVersion from settings';
throw 'Could not retrieve flowVersion from settings'; // eslint-disable-line no-throw-literal
}
confVer = /^[0-9]+\.[0-9]+$/.test(confVer) ? `${confVer}.0` : confVer;
return confVer.split('.').map(part => Number(part));
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
"babel-eslint": "^8.2.6",
"coveralls": "^3.0.2",
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.17.2",
"istanbul": "^0.4.5",
"mocha": "^5.2.0",
"sinon": "^7.2.2",
Expand Down
15 changes: 9 additions & 6 deletions tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('all rule files should be exported by the plugin', () => {
it(`should export ${ruleName}`, () => {
assert.equal(
plugin.rules[ruleName],
require(path.join('../lib/rules', ruleName))
require(path.join('../lib/rules', ruleName)) // eslint-disable-line import/no-dynamic-require
);
});
});
Expand All @@ -36,16 +36,16 @@ describe('deprecated rules', () => {
});

describe('configurations', () => {
it('should export a \'recommended\' configuration', () => {
it('should export a recommended configuration', () => {
assert(plugin.configs.recommended);
Object.keys(plugin.configs.recommended.rules).forEach(configName => {
assert.equal(configName.indexOf('react/'), 0);
const ruleName = configName.substring('react/'.length);
const ruleName = configName.slice('react/'.length);
assert(plugin.rules[ruleName]);
});

ruleFiles.forEach(ruleName => {
const inRecommendedConfig = Boolean(plugin.configs.recommended.rules[`react/${ruleName}`]);
const inRecommendedConfig = !!plugin.configs.recommended.rules[`react/${ruleName}`];
const isRecommended = plugin.rules[ruleName].meta.docs.recommended;
if (inRecommendedConfig) {
assert(isRecommended, `${ruleName} metadata should mark it as recommended`);
Expand All @@ -54,16 +54,19 @@ describe('configurations', () => {
}
});
});
it('should export a \'all\' configuration', () => {

it('should export an ‘all’ configuration', () => {
assert(plugin.configs.all);

Object.keys(plugin.configs.all.rules).forEach(configName => {
assert.equal(configName.indexOf('react/'), 0);
assert.equal(plugin.configs.all.rules[configName], 2);
});

ruleFiles.forEach(ruleName => {
const inDeprecatedRules = Boolean(plugin.deprecatedRules[ruleName]);
const inAllConfig = Boolean(plugin.configs.all.rules[`react/${ruleName}`]);
assert(inDeprecatedRules ^ inAllConfig);
assert(inDeprecatedRules ^ inAllConfig); // eslint-disable-line no-bitwise
});
});
});

0 comments on commit 9dd1350

Please sign in to comment.