Skip to content

Commit 3caa18a

Browse files
committed
Fixes json and prettier conficts.
1 parent a0703ae commit 3caa18a

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/json.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
const jsonc = require('eslint-plugin-jsonc');
2+
3+
const prettier = require('./prettier');
4+
15
const rules = {
26
'jsonc/array-bracket-newline': 'error',
37
'jsonc/array-bracket-spacing': ['error', 'never'],
@@ -61,6 +65,8 @@ const json5Only = {
6165
'jsonc/no-nan': 'error',
6266
};
6367

68+
const prettierRules = prettier.rules ? jsonc.configs.prettier.rules : {};
69+
6470
module.exports = {
6571
ignorePatterns: ['package-lock.json'],
6672
overrides: [
@@ -70,6 +76,7 @@ module.exports = {
7076
rules: {
7177
...rules,
7278
...jsonOnly,
79+
...prettierRules,
7380
},
7481
},
7582
{
@@ -78,12 +85,16 @@ module.exports = {
7885
rules: {
7986
...rules,
8087
...json5Only,
88+
...prettierRules,
8189
},
8290
},
8391
{
8492
files: ['*.jsonc'],
8593
parser: 'jsonc-eslint-parser',
86-
rules,
94+
rules: {
95+
...rules,
96+
...prettierRules,
97+
},
8798
},
8899
],
89100
plugins: ['jsonc'],

0 commit comments

Comments
 (0)