Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 55b8c56

Browse files
texastolandismail-syed
authored andcommitted
Remove inline Prettier configs (fixes #118) (#121)
* Upgrade TypeScript See eslint/typescript-eslint-parser#505. * Remove inline Prettier configs (fixes #118) Moves missing rule to `.prettierrc`. * Update changelog
1 parent 3d930b0 commit 55b8c56

File tree

6 files changed

+10
-20
lines changed

6 files changed

+10
-20
lines changed

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"singleQuote": true,
33
"bracketSpacing": false,
44
"trailingComma": "all",
5+
"jsxBracketSameLine": false,
56
"arrowParens": "always"
67
}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Fixed
6+
* Updated `typescript-eslint-parser` dependency to version 17.0.1 in order to support TypeScript 3.
7+
* `plugin:shopify/prettier` and `plugin:shopify/typescript-prettier` now defer Prettier's config to project's `.prettierrc`.
8+
59
### Changed
610
* Included `all` as a vague term for `no-vague-titles` ([#114](https://github.com/Shopify/eslint-plugin-shopify/pull/114))
711

lib/config/prettier.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@ module.exports = {
44
plugins: ['prettier'],
55

66
rules: {
7-
'prettier/prettier': [
8-
'error',
9-
{
10-
singleQuote: true,
11-
trailingComma: 'all',
12-
bracketSpacing: false,
13-
jsxBracketSameLine: false,
14-
arrowParens: 'always',
15-
},
16-
],
17-
187
// rules to disable to prefer prettier
198
'shopify/binary-assignment-parens': 'off',
209
'babel/semi': 'off',

lib/config/typescript-prettier.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ module.exports = {
66
'error',
77
{
88
parser: 'typescript',
9-
singleQuote: true,
10-
trailingComma: 'all',
11-
bracketSpacing: false,
12-
jsxBracketSameLine: false,
139
},
1410
],
1511
},

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@
9999
"merge": "1.2.0",
100100
"pascal-case": "^2.0.1",
101101
"pkg-dir": "2.0.0",
102-
"typescript-eslint-parser": "16.0.1"
102+
"typescript-eslint-parser": "17.0.1"
103103
}
104104
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,7 +1592,7 @@ eslint-plugin-react@7.7.0:
15921592
merge "1.2.0"
15931593
pascal-case "^2.0.1"
15941594
pkg-dir "2.0.0"
1595-
typescript-eslint-parser "16.0.1"
1595+
typescript-eslint-parser "17.0.1"
15961596

15971597
eslint-plugin-sort-class-members@1.3.1:
15981598
version "1.3.1"
@@ -3529,9 +3529,9 @@ typedarray@^0.0.6:
35293529
version "0.0.6"
35303530
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
35313531

3532-
typescript-eslint-parser@16.0.1:
3533-
version "16.0.1"
3534-
resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.1.tgz#b40681c7043b222b9772748b700a000b241c031b"
3532+
typescript-eslint-parser@17.0.1:
3533+
version "17.0.1"
3534+
resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-17.0.1.tgz#ddc681a3afa51a9baa6746a001eb5f29fb1365d3"
35353535
dependencies:
35363536
lodash.unescape "4.0.1"
35373537
semver "5.5.0"

0 commit comments

Comments
 (0)