Skip to content

Commit 927bb31

Browse files
authored
Merge pull request #183 from Commencis/feature/styled-components-config
feat: update styled-components config to resolve stylistic rule conflicts
2 parents 3720ad0 + 66aa5d3 commit 927bb31

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.changeset/silly-rocks-lay.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@commencis/stylelint-config': minor
3+
---
4+
5+
feat: update styled-components config to resolve conflicts with stylistic rules

packages/stylelint-config/src/configs/styled.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { StylelintConfig } from '@/types';
22

3-
import { styledRules } from '@/rules';
4-
5-
import cssConfig from './css';
3+
import { cssRules, orderRules, styledRules } from '@/rules';
64

75
const styledComponentsConfig: StylelintConfig = {
8-
...cssConfig,
6+
extends: ['stylelint-config-standard'],
7+
plugins: ['stylelint-order'],
98
customSyntax: 'postcss-styled-syntax',
10-
119
rules: {
12-
...cssConfig.rules,
10+
...cssRules,
11+
...orderRules,
1312
...styledRules,
1413
},
1514
};

packages/stylelint-config/src/rules/styledRules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export const styledRules = {
1919
'no-empty-source': null,
2020
// Disallow vendor prefixes for values
2121
'value-no-vendor-prefix': true,
22-
// Disallow vendor prefixes for properties
22+
// Disallow vendor prefixes for properties
2323
'property-no-vendor-prefix': true,
2424
};

0 commit comments

Comments
 (0)