Skip to content

Commit 522095c

Browse files
authored
Merge pull request #388 from Commencis/feature/import-sort-assets
feat: re-organize import-sort rules for styles and update dependencies
2 parents 3fe3b24 + 5dab124 commit 522095c

File tree

12 files changed

+448
-419
lines changed

12 files changed

+448
-419
lines changed

.changeset/ripe-hairs-wonder.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@commencis/lint-staged-config': minor
3+
'@commencis/commitlint-config': minor
4+
'@commencis/stylelint-config': minor
5+
'@commencis/eslint-config': minor
6+
'@commencis/eslint-plugin': minor
7+
---
8+
9+
chore: update dependencies

.changeset/witty-tigers-strive.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@commencis/eslint-config': minor
3+
---
4+
5+
feat: re-organize import sort rules for styles and assets

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.19
1+
22.20

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ The repository is structured as a monorepo, which allows for managing all the pa
3333

3434
#### Node.js
3535

36-
Before you begin, ensure you have `node: >= 22.14` installed on your system.
36+
Before you begin, ensure you have `node: >= 22.20` installed on your system.
3737

3838
#### pnpm
3939

40-
This project uses `pnpm` as the package manager. You can install it either by activating with `corepack` which is the recommended way:
40+
This project uses `pnpm@10.17.1` as the package manager. You can install it either by activating with `corepack` which is the recommended way:
4141

4242
```bash
43-
corepack prepare pnpm@latest --activate
43+
corepack prepare pnpm@10.17.1 --activate
4444
corepack enable pnpm
4545
```
4646

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"license": "Apache-2.0",
2121
"type": "module",
2222
"engines": {
23-
"node": ">= 22.14"
23+
"node": ">= 22.20"
2424
},
25-
"packageManager": "pnpm@10.15.0",
25+
"packageManager": "pnpm@10.17.1",
2626
"scripts": {
2727
"preinstall": "npx only-allow pnpm",
2828
"dev": "turbo run dev",
@@ -46,20 +46,20 @@
4646
"prepare": "husky"
4747
},
4848
"devDependencies": {
49-
"@changesets/cli": "2.29.6",
49+
"@changesets/cli": "2.29.7",
5050
"@commencis/commitlint-config": "1.1.4",
51-
"@commencis/eslint-config": "2.1.0",
51+
"@commencis/eslint-config": "2.1.1",
5252
"@commencis/lint-staged-config": "1.1.0",
5353
"@commencis/prettier-config": "2.0.0",
5454
"@commencis/ts-config": "0.0.2",
55-
"@commitlint/cli": "19.8.1",
55+
"@commitlint/cli": "20.0.0",
5656
"@svitejs/changesets-changelog-github-compact": "1.2.0",
5757
"@vitest/coverage-v8": "3.2.4",
58-
"eslint": "9.34.0",
58+
"eslint": "9.36.0",
5959
"husky": "9.1.7",
60-
"lint-staged": "16.1.5",
60+
"lint-staged": "16.2.1",
6161
"prettier": "3.6.2",
62-
"turbo": "2.5.6",
62+
"turbo": "2.5.8",
6363
"typescript": "5.9.2",
6464
"vitest": "3.2.4"
6565
}

packages/commitlint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@commencis/ts-config": "0.0.2",
42-
"@commitlint/types": "19.8.1",
42+
"@commitlint/types": "20.0.0",
4343
"tsup": "8.5.0",
4444
"typescript": "5.9.2"
4545
}

packages/eslint-config/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,22 @@
6363
"lint:types": "tsc --noEmit"
6464
},
6565
"dependencies": {
66-
"@eslint/js": "9.34.0",
67-
"@next/eslint-plugin-next": "15.5.2",
68-
"@typescript-eslint/utils": "8.41.0",
66+
"@eslint/js": "9.36.0",
67+
"@next/eslint-plugin-next": "15.5.4",
68+
"@typescript-eslint/utils": "8.44.1",
6969
"eslint-config-prettier": "10.1.8",
7070
"eslint-plugin-jsx-a11y": "6.10.2",
7171
"eslint-plugin-prettier": "5.5.4",
7272
"eslint-plugin-react": "7.37.5",
7373
"eslint-plugin-react-hooks": "5.2.0",
7474
"eslint-plugin-simple-import-sort": "12.1.1",
75-
"eslint-plugin-vue": "10.4.0",
76-
"globals": "16.3.0",
77-
"typescript-eslint": "8.41.0"
75+
"eslint-plugin-vue": "10.5.0",
76+
"globals": "16.4.0",
77+
"typescript-eslint": "8.44.1"
7878
},
7979
"devDependencies": {
8080
"@commencis/ts-config": "0.0.2",
81-
"eslint": "9.34.0",
81+
"eslint": "9.36.0",
8282
"tsup": "8.5.0",
8383
"typescript": "5.9.2"
8484
},

packages/eslint-config/src/rules/importSortRules.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,20 @@ const GROUPS: Record<string, string[]> = {
6868
'components',
6969
]),
7070

71-
// Internal root alias (catch-all leftover @/ imports)
72-
INTERNAL_ROOT: ['^@/.+$'],
71+
// Internal root alias (catch-all leftover @/ imports except styles and assets)
72+
INTERNAL_ROOT: ['^@/(?!.*\\.(s?css|svg|png)$).+$'],
7373

7474
// Relative parent imports then same-dir relatives
7575
RELATIVE_PARENT: ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
7676
RELATIVE_SAME: ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
7777

7878
// Styles
79-
STYLES: ['^.+\\.(s?css|(style(s)?)\\..+)$'],
79+
STYLES: ['^@/.+\\.s?css$', '^\\./.+\\.s?css$'],
8080

8181
// Assets
8282
ASSETS: [
8383
'(asset(s?)|public|static|images)(/.*|$)',
84+
'^@/.+\\.(svg|png)$',
8485
'^.+\\.svg$',
8586
'^.+\\.png$',
8687
],

packages/eslint-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"lint:types": "tsc --noEmit"
3535
},
3636
"dependencies": {
37-
"@typescript-eslint/utils": "8.41.0"
37+
"@typescript-eslint/utils": "8.44.1"
3838
},
3939
"devDependencies": {
4040
"@commencis/ts-config": "0.0.2",

packages/lint-staged-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"@commencis/ts-config": "0.0.2",
38-
"lint-staged": "16.1.5",
38+
"lint-staged": "16.2.1",
3939
"tsup": "8.5.0",
4040
"typescript": "5.9.2"
4141
}

0 commit comments

Comments
 (0)