Skip to content

Commit

Permalink
Update dprint to 0.41 and bump plugins (microsoft#55580)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakebailey authored Sep 12, 2023
1 parent 4b0f54f commit 26704c6
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 71 deletions.
3 changes: 2 additions & 1 deletion .dprint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@
"**/*.generated.*",
"scripts/*.d.*"
],
// Note: if adding new languages, make sure settings.template.json is updated too.
"plugins": [
"https://plugins.dprint.dev/typescript-0.86.1.wasm",
"https://plugins.dprint.dev/typescript-0.87.1.wasm",
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe",
"https://plugins.dprint.dev/json-0.17.4.wasm"
]
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,12 @@ jobs:
check-latest: true
- run: npm ci

# TODO: The cache fails when copied between GHA runners. See:
# https://github.com/dprint/dprint/issues/734
# https://github.com/dprint/dprint/issues/735
# - uses: actions/cache@v3
# with:
# path: ~/.cache/dprint
# key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
# restore-keys: |
# ${{ runner.os }}-dprint-
- uses: actions/cache@v3
with:
path: ~/.cache/dprint
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
restore-keys: |
${{ runner.os }}-dprint-
- name: Check formatting
run: npx dprint check
Expand Down
12 changes: 7 additions & 5 deletions .vscode/settings.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
// To use the locally built compiler, after 'npm run build':
// "typescript.tsdk": "built/local"

// Enables dprint formatting on all supported files. Setting this as the
// default for all file types is safe as dprint will just ignore any file
// it doesn't support or has explicitly excluded in .dprint.jsonc.
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true,
// Enables dprint formatting on all supported files. We explicitly list
// languages here to ensure that these are more specific than those in a
// user's settings.json so take precedence.
"[typescript][typescriptreact][javascript][javascriptreact][json][jsonc][yaml][github-actions-workflow]": {
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true
},

// To ignore commits listed in .git-blame-ignore-revs in GitLens:
"gitlens.advanced.blame.customArguments": [
Expand Down
110 changes: 55 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"chalk": "^4.1.2",
"chokidar": "^3.5.3",
"diff": "^5.1.0",
"dprint": "^0.40.2",
"dprint": "^0.41.0",
"esbuild": "^0.19.0",
"eslint": "^8.22.0",
"eslint-formatter-autolinkable-stylish": "^1.2.0",
Expand Down

0 comments on commit 26704c6

Please sign in to comment.