Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(prettier): update config for Prettier v3 update #90

Merged
merged 8 commits into from
Aug 13, 2023
Merged

chore(prettier): update config for Prettier v3 update #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c9eec8
chore(prettier): update config for major version
dschach Aug 11, 2023
ff2dc51
build: config files update
dschach Aug 12, 2023
b95169b
format package.json
dschach Aug 13, 2023
3b12579
Merge branch 'main' into update-prettier-plugin-apex
dschach Aug 13, 2023
65c4e05
add xml plugin to prettier
dschach Aug 13, 2023
13178ad
Merge branch 'update-prettier-plugin-apex' of https://github.com/dsch…
dschach Aug 13, 2023
2a100e0
add config file to verify command
dschach Aug 13, 2023
6b4d917
don't verify css or html
dschach Aug 13, 2023
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
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ node_modules
.vscode
./*.json
!release-please-config.json
**/*-meta.xml

coverage/

Expand Down
18 changes: 16 additions & 2 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,23 @@
"files": "*.css",
"options": { "useTabs": false, "tabWidth": 4, "singleQuote": false }
},
{
"files": "*.cls",
"options": { "parser": "apex", "tabWidth": 4, "singleQuote": true }
},
{
"files": "*.{yml,yaml}",
"options": { "singleQuote": false }
"options": { "parser": "yaml", "singleQuote": false }
},
{
"files": "*.json",
"options": { "parser": "json", "printWidth": 80, "singleQuote": false }
},
{
"files": ".prettierrc",
"options": { "parser": "json", "printWidth": 80 }
}
]
],
"plugins": ["prettier-plugin-apex", "@prettier/plugin-xml"],
"$schema": "https://json.schemastore.org/prettierrc"
}
8 changes: 1 addition & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"apex:local:start": "node node_modules/prettier-plugin-apex/dist/bin/start-apex-server.js",
"apex:local:stop": "node node_modules/prettier-plugin-apex/dist/bin/stop-apex-server.js",
"prettier": "prettier --write \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"",
"prettier:verify": "prettier --list-different \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"",
"prettier:verify": "prettier --list-different \"**/*.{cls,cmp,component,js,json,md,page,trigger,xml,yaml,yml}\" --config .prettierrc",
"prettier:docs": "prettier --write \"docs/**/*.html\"",
"initialize": ". scripts/initialize.sh",
"orginit": ". scripts/orginit.sh",
Expand All @@ -28,12 +28,6 @@
"lint-staged": {
"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}": [
"prettier --write"
],
"docs/**/*.html": [
"prettier --write --tab-width 2"
],
"doc-assets/**/*.html": [
"prettier --write --tab-width 2"
]
}
}
2 changes: 1 addition & 1 deletion release-please-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"changelog-path": "CHANGELOG.md",
"include-v-in-tag": true,
"plugins": [{ "type": "sentence-case" }],
"release-type": "salesforce",
"release-type": "sfdx",
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
"extra-files": [
{
Expand Down