Merge pull request #183 from Commencis/feature/styled-components-config

feat: update styled-components config to resolve stylistic rule conflicts
Commencis · Dec 25, 2024 · 927bb31 · 927bb31
2 parents 3720ad0 + 66aa5d3
commit 927bb31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.changeset/silly-rocks-lay.md b/.changeset/silly-rocks-lay.md
@@ -0,0 +1,5 @@
+---
+'@commencis/stylelint-config': minor
+---
+
+feat: update styled-components config to resolve conflicts with stylistic rules
diff --git a/packages/stylelint-config/src/configs/styled.ts b/packages/stylelint-config/src/configs/styled.ts
@@ -1,15 +1,14 @@
 import { StylelintConfig } from '@/types';
 
-import { styledRules } from '@/rules';
-
-import cssConfig from './css';
+import { cssRules, orderRules, styledRules } from '@/rules';
 
 const styledComponentsConfig: StylelintConfig = {
-  ...cssConfig,
+  extends: ['stylelint-config-standard'],
+  plugins: ['stylelint-order'],
   customSyntax: 'postcss-styled-syntax',
-
   rules: {
-    ...cssConfig.rules,
+    ...cssRules,
+    ...orderRules,
     ...styledRules,
   },
 };

diff --git a/packages/stylelint-config/src/rules/styledRules.ts b/packages/stylelint-config/src/rules/styledRules.ts
@@ -19,6 +19,6 @@ export const styledRules = {
   'no-empty-source': null,
   // Disallow vendor prefixes for values
   'value-no-vendor-prefix': true,
-  //  Disallow vendor prefixes for properties
+  // Disallow vendor prefixes for properties
   'property-no-vendor-prefix': true,
 };