diff --git a/package.json b/package.json index cd65d984aa..d5c40fb085 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@spscommerce/typescript", - "version": "0.0.12", + "version": "0.0.15", "description": "SPS official style guides and lint configs for frontend development, forked from airbnb/javascript", "private": true, "scripts": { diff --git a/typescript/README.md b/typescript/README.md index 23af92b1e6..56e7b2b425 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1590,8 +1590,6 @@ foo.init(); **Enforced by Prettier** - [`object-curly-newline`](https://eslint.org/docs/rules/object-curly-newline) - > Why? The curly braces follow the same indentation rules as every other curly brace block in the style guide, as do the trailing commas. ```typescript @@ -1609,6 +1607,8 @@ import { } from 'path'; ``` +Note: formerly we used [`object-curly-newline`](https://eslint.org/docs/rules/object-curly-newline) but have turned it off due to conflicts with how Prettier handles this. + --- diff --git a/typescript/package.json b/typescript/package.json index bb9abfd672..f2097c3484 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@spscommerce/eslint-config-typescript", - "version": "0.0.13", + "version": "0.0.15", "description": "SPS official linter configuration for TypeScript.", "main": "lib/index.js", "scripts": { diff --git a/typescript/rules/stylisticIssues.ts b/typescript/rules/stylisticIssues.ts index a4801b2434..f9ce53d963 100644 --- a/typescript/rules/stylisticIssues.ts +++ b/typescript/rules/stylisticIssues.ts @@ -427,14 +427,7 @@ export const stylisticIssues: Linter.RulesRecord = { * enforce line breaks between braces 🔧 * https://eslint.org/docs/rules/object-curly-newline */ - "object-curly-newline": [ - "error", - { - minProperties: 4, - multiline: true, - consistent: true, - }, - ], + "object-curly-newline": "off", /** * require padding inside curly braces 🔧