Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/crazy-monkeys-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@commencis/eslint-config': minor
---

feat: include side-effect scss imports to sorting
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
},
"devDependencies": {
"@changesets/cli": "2.29.7",
"@commencis/commitlint-config": "1.1.4",
"@commencis/eslint-config": "2.1.1",
"@commencis/lint-staged-config": "1.1.0",
"@commencis/commitlint-config": "1.2.0",
"@commencis/eslint-config": "2.2.0",
"@commencis/lint-staged-config": "1.2.0",
"@commencis/prettier-config": "2.0.0",
"@commencis/ts-config": "0.0.2",
"@commitlint/cli": "20.0.0",
Expand Down
15 changes: 11 additions & 4 deletions packages/eslint-config/src/rules/importSortRules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,23 @@ const GROUPS: Record<string, string[]> = {
RELATIVE_PARENT: ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
RELATIVE_SAME: ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],

// Styles
STYLES: ['^@/.+\\.s?css$', '^\\./.+\\.s?css$'],

// Assets
ASSETS: [
'(asset(s?)|public|static|images)(/.*|$)',
'^@/.+\\.(svg|png)$',
'^.+\\.svg$',
'^.+\\.png$',
],

// Styles
STYLES: [
// side-effect - virtual css imports
'^\\u0000.+\\.s?css$',
// root alias css imports
'^@/.+\\.s?css$',
// relative css imports
'^(\\.{1,2}/).+\\.s?css$',
],
};

export const importSortRules: Linter.RulesRecord = {
Expand All @@ -100,8 +107,8 @@ export const importSortRules: Linter.RulesRecord = {
withTypeFirst(GROUPS.INTERNAL_ROOT),
withTypeFirst(GROUPS.RELATIVE_PARENT),
withTypeFirst(GROUPS.RELATIVE_SAME),
GROUPS.STYLES,
GROUPS.ASSETS,
GROUPS.STYLES,
],
},
],
Expand Down
Loading