diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ae2c3..0d22d26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Changed rules - Relax rule: Don't require newlines between *single-line* member functions or class field declarations ([lines-between-class-members](https://eslint.org/docs/rules/lines-between-class-members)) [#1347](https://github.com/standard/standard/issues/1347) +- Relax rule: Don't check indentation on template literal children (work around for ESLint bug) ([indent](https://eslint.org/docs/rules/indent)) [#1176](https://github.com/standard/standard/issues/1176) ## 13.1.0 - 2019-07-20 diff --git a/eslintrc.json b/eslintrc.json index ae9c66a..ec30dab 100644 --- a/eslintrc.json +++ b/eslintrc.json @@ -3,10 +3,25 @@ "rules": { "dot-notation": ["error", { "allowKeywords": true }], "import/no-absolute-path": ["error", { "esmodule": true, "commonjs": true, "amd": false }], + "indent": ["error", 2, { + "SwitchCase": 1, + "VariableDeclarator": 1, + "outerIIFEBody": 1, + "MemberExpression": 1, + "FunctionDeclaration": { "parameters": 1, "body": 1 }, + "FunctionExpression": { "parameters": 1, "body": 1 }, + "CallExpression": { "arguments": 1 }, + "ArrayExpression": 1, + "ObjectExpression": 1, + "ImportDeclaration": 1, + "flatTernaryExpressions": false, + "ignoreComments": false, + "ignoredNodes": ["TemplateLiteral > *"] + }], "lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }], "no-self-assign": ["error", { "props": true }], - "quotes": ["error", "single", { "avoidEscape": true }], "operator-linebreak": ["error", "after", { "overrides": { "?": "before", ":": "before", "|>": "before" } }], + "quotes": ["error", "single", { "avoidEscape": true }], "react/jsx-tag-spacing": ["error", { "beforeSelfClosing": "always", "beforeClosing": "never" }] }