Skip to content

Commit

Permalink
Replace yamlfmt with pretty_yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed Jul 7, 2024
1 parent 33ebaa2 commit 5e6e75b
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 31 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches: [main]
pull_request:

jobs:
dprint:
timeout-minutes: 15
Expand All @@ -13,7 +12,6 @@ jobs:
- uses: dprint/[email protected]
with:
dprint-version: '0.45.1' # selfup { "extract": "\\d[^']+", "replacer": ["dprint", "--version"], "nth": 2 }

typos:
timeout-minutes: 15
runs-on: ubuntu-24.04
Expand All @@ -26,14 +24,3 @@ jobs:
.
.github
.vscode
yamlfmt:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v5
- name: Install yamlfmt
run: go install github.com/google/yamlfmt/cmd/[email protected] # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
- run: yamlfmt -lint .
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"editorconfig.editorconfig",
"tekumara.typos-vscode",
"dprint.dprint",
"kachick.vscode-yamlfmt",
"stylelint.vscode-stylelint",
"jnoortheen.nix-ide"
]
Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true,
"[yaml]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[github-actions-workflow]": {
"editor.defaultFormatter": "kachick.vscode-yamlfmt"
},
"[elm]": {
"editor.defaultFormatter": "elmTooling.elm-ls-vscode"
},
Expand Down
4 changes: 3 additions & 1 deletion dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
},
"json": {},
"markdown": {},
"yaml": { "quotes": "preferSingle" },
"malva": {
"quotes": "preferSingle"
},
Expand All @@ -20,6 +21,7 @@
"https://plugins.dprint.dev/json-0.19.3.wasm",
"https://plugins.dprint.dev/markdown-0.17.1.wasm",
"https://plugins.dprint.dev/g-plane/malva-v0.5.1.wasm",
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.10.0.wasm"
"https://plugins.dprint.dev/g-plane/markup_fmt-v0.10.0.wasm",
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.2.0.wasm"
]
}
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
nil
nixpkgs-fmt
dprint
yamlfmt
nodejs_20
elmPackages.elm-json
deno
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"lint": "deno lint && elm-review && npm run stylelint:check",
"check": "typos && npm run format:check && npm run typecheck && npm test && npm run lint",
"preview": "vite preview",
"format:check": "dprint check && yamlfmt -lint . && npx elm-format --validate src",
"format:fix": "dprint fmt && yamlfmt . && npx elm-format src",
"format:check": "dprint check && npx elm-format --validate src",
"format:fix": "dprint fmt && npx elm-format src",
"stylelint:check": "npx stylelint '{src,public}/**/*.css'",
"stylelint:fix": "npx stylelint '{src,public}/**/*.css' --fix",
"typecheck": "tsc",
Expand Down
7 changes: 0 additions & 7 deletions yamlfmt.yml

This file was deleted.

0 comments on commit 5e6e75b

Please sign in to comment.