Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit 26704c6

Browse files
authored
Update dprint to 0.41 and bump plugins (microsoft#55580)
1 parent 4b0f54f commit 26704c6

File tree

5 files changed

+71
-71
lines changed

5 files changed

+71
-71
lines changed

.dprint.jsonc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
"**/*.generated.*",
5050
"scripts/*.d.*"
5151
],
52+
// Note: if adding new languages, make sure settings.template.json is updated too.
5253
"plugins": [
53-
"https://plugins.dprint.dev/typescript-0.86.1.wasm",
54+
"https://plugins.dprint.dev/typescript-0.87.1.wasm",
5455
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe",
5556
"https://plugins.dprint.dev/json-0.17.4.wasm"
5657
]

.github/workflows/ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,12 @@ jobs:
7676
check-latest: true
7777
- run: npm ci
7878

79-
# TODO: The cache fails when copied between GHA runners. See:
80-
# https://github.com/dprint/dprint/issues/734
81-
# https://github.com/dprint/dprint/issues/735
82-
# - uses: actions/cache@v3
83-
# with:
84-
# path: ~/.cache/dprint
85-
# key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
86-
# restore-keys: |
87-
# ${{ runner.os }}-dprint-
79+
- uses: actions/cache@v3
80+
with:
81+
path: ~/.cache/dprint
82+
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
83+
restore-keys: |
84+
${{ runner.os }}-dprint-
8885
8986
- name: Check formatting
9087
run: npx dprint check

.vscode/settings.template.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
// To use the locally built compiler, after 'npm run build':
55
// "typescript.tsdk": "built/local"
66

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

1315
// To ignore commits listed in .git-blame-ignore-revs in GitLens:
1416
"gitlens.advanced.blame.customArguments": [

package-lock.json

Lines changed: 55 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"chalk": "^4.1.2",
6060
"chokidar": "^3.5.3",
6161
"diff": "^5.1.0",
62-
"dprint": "^0.40.2",
62+
"dprint": "^0.41.0",
6363
"esbuild": "^0.19.0",
6464
"eslint": "^8.22.0",
6565
"eslint-formatter-autolinkable-stylish": "^1.2.0",

0 commit comments

Comments
 (0)