Skip to content

Commit 75adc99

Browse files
JoshuaKGoldbergJoshuaKGoldberg
authored
chore: enabled Prettier in Trunk (#19354)
* chore: enable Prettier in Trunk * chore: remove formatting-related lint rules internally * Switch .prettierrc.json to organization standard
1 parent 2395168 commit 75adc99

7 files changed

Lines changed: 34 additions & 15 deletions

File tree

‎.markdownlint.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
default: true
2+
extends: markdownlint/style/prettier
23

34
# Exclusions for deliberate/widespread violations
45
MD002: false # First header should be a h1 header
5-
MD010: false # Hard tabs
6-
MD013: false # Line length
76
MD024: false # Multiple headers with the same content
87
MD026: false # Trailing punctuation in header
9-
MD030: false # Spaces after list markers
108
MD033: false # Allow inline HTML
119
MD041: false # First line in file should be a top level header
1210
MD046: # Code block style

‎.prettierrc.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"useTabs": true,
3+
"tabWidth": 4,
4+
"arrowParens": "avoid",
5+
6+
"overrides": [
7+
{
8+
"files": ["*.json"],
9+
"options": {
10+
"tabWidth": 2,
11+
"useTabs": false
12+
}
13+
}
14+
]
15+
}

‎.trunk/trunk.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ lint:
4545
- checkov@3.2.228
4646
- markdownlint@0.41.0
4747
- oxipng@9.1.2
48+
- prettier@3.3.3
4849
- renovate@38.37.1
4950
- shellcheck@0.10.0
5051
- shfmt@3.6.0
@@ -53,9 +54,15 @@ lint:
5354
- yamllint
5455
- trufflehog # Requires the network to run.
5556
ignore:
56-
- linters: [markdownlint]
57+
- linters: [markdownlint, prettier]
5758
paths:
5859
- CHANGELOG.md
60+
- linters: [prettier]
61+
paths:
62+
- docs/src/_includes
63+
- docs/src/rules/*.md
64+
- packages/js/src/configs/eslint-all.js
65+
- tests/fixtures
5966
actions:
6067
disabled:
6168
- trunk-announce

‎conf/replacements.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"space-before-function-parentheses": ["space-before-function-paren"],
1616
"space-before-keywords": ["keyword-spacing"],
1717
"space-in-brackets": [
18-
"object-curly-spacing",
19-
"array-bracket-spacing",
20-
"computed-property-spacing"
18+
"object-curly-spacing",
19+
"array-bracket-spacing",
20+
"computed-property-spacing"
2121
],
2222
"space-return-throw-case": ["keyword-spacing"],
2323
"space-unary-word-ops": ["space-unary-ops"],

‎conf/rule-type-list.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
{
1818
"removed": "no-arrow-condition",
1919
"replacedBy": [
20-
{ "rule": { "name": "no-confusing-arrow" } },
21-
{ "rule": { "name": "no-constant-condition" } }
20+
{ "rule": { "name": "no-confusing-arrow" } },
21+
{ "rule": { "name": "no-constant-condition" } }
2222
]
2323
},
2424
{
@@ -68,8 +68,8 @@
6868
{
6969
"removed": "space-in-brackets",
7070
"replacedBy": [
71-
{ "rule": { "name": "object-curly-spacing" } },
72-
{ "rule": { "name": "array-bracket-spacing" } }
71+
{ "rule": { "name": "object-curly-spacing" } },
72+
{ "rule": { "name": "array-bracket-spacing" } }
7373
]
7474
},
7575
{

‎docs/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"stylelint": "^14.13.0",
5353
"stylelint-config-html": "^1.1.0",
5454
"stylelint-config-standard": "^29.0.0",
55+
"stylelint-config-prettier": "^9.0.5",
5556
"stylelint-config-standard-scss": "^5.0.0",
5657
"stylelint-config-prettier": "^9.0.5",
5758
"tap-spot": "^1.1.2"

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
"pre-commit": "lint-staged"
8080
},
8181
"lint-staged": {
82-
"*.js": "trunk check --fix --filter=eslint",
83-
"*.md": "trunk check --fix --filter=markdownlint",
82+
"*": "trunk check --fix",
8483
"lib/rules/*.js": [
8584
"node tools/update-eslint-all.js",
8685
"node tools/update-rule-type-headers.js",
@@ -90,8 +89,7 @@
9089
"node tools/check-rule-examples.js",
9190
"node tools/fetch-docs-links.js",
9291
"git add docs/src/_data/further_reading_links.json"
93-
],
94-
"docs/**/*.svg": "trunk check --fix --filter=svgo"
92+
]
9593
},
9694
"files": [
9795
"LICENSE",

0 commit comments

Comments
 (0)