diff --git a/.dprint.jsonc b/.dprint.jsonc index 312e4bf7b5a..1e158667189 100644 --- a/.dprint.jsonc +++ b/.dprint.jsonc @@ -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" ] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a34b158ea08..3f6933ae8ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.vscode/settings.template.json b/.vscode/settings.template.json index 9162a53f6b1..bdc064f8948 100644 --- a/.vscode/settings.template.json +++ b/.vscode/settings.template.json @@ -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": [ diff --git a/package-lock.json b/package-lock.json index 637e7ad3d25..08a53215de3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,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", @@ -74,9 +74,9 @@ "dev": true }, "node_modules/@dprint/darwin-arm64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.40.2.tgz", - "integrity": "sha512-qharMFhxpNq9brgvHLbqzzAgVgPWSHLfzNLwWWhKcGOUUDUIilfAo3SlvOz6w4nQiIifLpYZOvZqK7Lpf9mSSw==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.41.0.tgz", + "integrity": "sha512-P9PtcQI0mrI4U6yyd+/iI664BHSqC9KTS6ogq0ptEdnLtlaWzf09D1nv6FBaHiG9m3conuBRlPsoUqt3j6PZ2w==", "cpu": [ "arm64" ], @@ -87,9 +87,9 @@ ] }, "node_modules/@dprint/darwin-x64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.40.2.tgz", - "integrity": "sha512-FPDdOTVr1JfqtLBTCvqlihWslTy3LBUoi3H1gaqIazCKMj2dB9voFWkBiMT+REMHDrlVsoSpFAfsliNr/y7HPA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.41.0.tgz", + "integrity": "sha512-mSYnSoH0uyCkjgIWTny2DZAcaiRTe3kRWY5SeZECLGO37e+SdVg+ZjSzndhOvvEb9pv8EeBO1NJ9gHOSceT5Xw==", "cpu": [ "x64" ], @@ -100,9 +100,9 @@ ] }, "node_modules/@dprint/linux-arm64-glibc": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.40.2.tgz", - "integrity": "sha512-GmUWfKwEwXA+onvewX9hEJSMcd9V184+uRbEhI5tG28tBP9+IjQhrY7jCjxPvaZA+EvzNPnAy5D1wbJdlNLBNA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.41.0.tgz", + "integrity": "sha512-U4xWzjjO/aAct8cSSMZFhg8l1jWy6VahXh8zWjGBufwX7t3xEcxMG9RyAp/ioYSY6wl4YXAmnUHywhC+wSjDHQ==", "cpu": [ "arm64" ], @@ -113,9 +113,9 @@ ] }, "node_modules/@dprint/linux-x64-glibc": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.40.2.tgz", - "integrity": "sha512-vMHAHdsOY+2thieSWbIrIioDfPgvipwUgd0MZUWOqycTrXU6kLyi2B+5J/2Jc+QO3CiLIbumQd2FH/0vB1eWqA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.41.0.tgz", + "integrity": "sha512-wjv5l4mGns7E8i32E8FfAk45tw5O7v4NM17gtvhe6ggOiOD6quHowOH00pLfEakMLMF9y0J5ZO2hxJ/w06bXmQ==", "cpu": [ "x64" ], @@ -126,9 +126,9 @@ ] }, "node_modules/@dprint/linux-x64-musl": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.40.2.tgz", - "integrity": "sha512-nFSbDWd9ORyOhJ7a+RmE39WbuPoQ3OQutIgfAmfikiu/wENzEwxxv4QJ7aFnBaoZb0wuVEEpXShr8vY4p0exkg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.41.0.tgz", + "integrity": "sha512-ZZOqiur9Xi/2uhz0Ce215VTSajAlSrduX/5k/hpIjI7Rgz22Vn77p5fmYxzWkTt/Li1zq5zboTvmGYx0QVNMrQ==", "cpu": [ "x64" ], @@ -139,9 +139,9 @@ ] }, "node_modules/@dprint/win32-x64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.40.2.tgz", - "integrity": "sha512-qF4VCQzFTZYD61lbQqXLU/IwUTbLK22CancO+uVtXmZRoKU9GaVjcBhMUB7URxsa8rvxWHhHT6ldillI/aOWCg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.41.0.tgz", + "integrity": "sha512-mFx6x4Hn848/D4gPbDm7g1wlnOh2SGoVF9c9HMGCuOobUU2WIBztzV4L5qlFCB3gprlS0ru9BhlMpGhrp0CBYA==", "cpu": [ "x64" ], @@ -1715,21 +1715,21 @@ } }, "node_modules/dprint": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.40.2.tgz", - "integrity": "sha512-3LdyUV0itEW59UPtsRA2StOWOu8FyOW+BgvJpH/tACRHKi0z5gaQnvSxdS3mbG7dgtEhdRnGg6JoiQyGib6NTg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.41.0.tgz", + "integrity": "sha512-9Ctv6EnwOy5Ai566DczI/QhAC6y+AhWDA2gFU8Zz4xezUy1BevHaIYhfdLWZQxh4Qf4H28lRu1Lq+hhIm1US9w==", "dev": true, "hasInstallScript": true, "bin": { "dprint": "bin.js" }, "optionalDependencies": { - "@dprint/darwin-arm64": "0.40.2", - "@dprint/darwin-x64": "0.40.2", - "@dprint/linux-arm64-glibc": "0.40.2", - "@dprint/linux-x64-glibc": "0.40.2", - "@dprint/linux-x64-musl": "0.40.2", - "@dprint/win32-x64": "0.40.2" + "@dprint/darwin-arm64": "0.41.0", + "@dprint/darwin-x64": "0.41.0", + "@dprint/linux-arm64-glibc": "0.41.0", + "@dprint/linux-x64-glibc": "0.41.0", + "@dprint/linux-x64-musl": "0.41.0", + "@dprint/win32-x64": "0.41.0" } }, "node_modules/emoji-regex": { @@ -3879,44 +3879,44 @@ "dev": true }, "@dprint/darwin-arm64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.40.2.tgz", - "integrity": "sha512-qharMFhxpNq9brgvHLbqzzAgVgPWSHLfzNLwWWhKcGOUUDUIilfAo3SlvOz6w4nQiIifLpYZOvZqK7Lpf9mSSw==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.41.0.tgz", + "integrity": "sha512-P9PtcQI0mrI4U6yyd+/iI664BHSqC9KTS6ogq0ptEdnLtlaWzf09D1nv6FBaHiG9m3conuBRlPsoUqt3j6PZ2w==", "dev": true, "optional": true }, "@dprint/darwin-x64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.40.2.tgz", - "integrity": "sha512-FPDdOTVr1JfqtLBTCvqlihWslTy3LBUoi3H1gaqIazCKMj2dB9voFWkBiMT+REMHDrlVsoSpFAfsliNr/y7HPA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.41.0.tgz", + "integrity": "sha512-mSYnSoH0uyCkjgIWTny2DZAcaiRTe3kRWY5SeZECLGO37e+SdVg+ZjSzndhOvvEb9pv8EeBO1NJ9gHOSceT5Xw==", "dev": true, "optional": true }, "@dprint/linux-arm64-glibc": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.40.2.tgz", - "integrity": "sha512-GmUWfKwEwXA+onvewX9hEJSMcd9V184+uRbEhI5tG28tBP9+IjQhrY7jCjxPvaZA+EvzNPnAy5D1wbJdlNLBNA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.41.0.tgz", + "integrity": "sha512-U4xWzjjO/aAct8cSSMZFhg8l1jWy6VahXh8zWjGBufwX7t3xEcxMG9RyAp/ioYSY6wl4YXAmnUHywhC+wSjDHQ==", "dev": true, "optional": true }, "@dprint/linux-x64-glibc": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.40.2.tgz", - "integrity": "sha512-vMHAHdsOY+2thieSWbIrIioDfPgvipwUgd0MZUWOqycTrXU6kLyi2B+5J/2Jc+QO3CiLIbumQd2FH/0vB1eWqA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.41.0.tgz", + "integrity": "sha512-wjv5l4mGns7E8i32E8FfAk45tw5O7v4NM17gtvhe6ggOiOD6quHowOH00pLfEakMLMF9y0J5ZO2hxJ/w06bXmQ==", "dev": true, "optional": true }, "@dprint/linux-x64-musl": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.40.2.tgz", - "integrity": "sha512-nFSbDWd9ORyOhJ7a+RmE39WbuPoQ3OQutIgfAmfikiu/wENzEwxxv4QJ7aFnBaoZb0wuVEEpXShr8vY4p0exkg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.41.0.tgz", + "integrity": "sha512-ZZOqiur9Xi/2uhz0Ce215VTSajAlSrduX/5k/hpIjI7Rgz22Vn77p5fmYxzWkTt/Li1zq5zboTvmGYx0QVNMrQ==", "dev": true, "optional": true }, "@dprint/win32-x64": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.40.2.tgz", - "integrity": "sha512-qF4VCQzFTZYD61lbQqXLU/IwUTbLK22CancO+uVtXmZRoKU9GaVjcBhMUB7URxsa8rvxWHhHT6ldillI/aOWCg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.41.0.tgz", + "integrity": "sha512-mFx6x4Hn848/D4gPbDm7g1wlnOh2SGoVF9c9HMGCuOobUU2WIBztzV4L5qlFCB3gprlS0ru9BhlMpGhrp0CBYA==", "dev": true, "optional": true }, @@ -4977,17 +4977,17 @@ } }, "dprint": { - "version": "0.40.2", - "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.40.2.tgz", - "integrity": "sha512-3LdyUV0itEW59UPtsRA2StOWOu8FyOW+BgvJpH/tACRHKi0z5gaQnvSxdS3mbG7dgtEhdRnGg6JoiQyGib6NTg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.41.0.tgz", + "integrity": "sha512-9Ctv6EnwOy5Ai566DczI/QhAC6y+AhWDA2gFU8Zz4xezUy1BevHaIYhfdLWZQxh4Qf4H28lRu1Lq+hhIm1US9w==", "dev": true, "requires": { - "@dprint/darwin-arm64": "0.40.2", - "@dprint/darwin-x64": "0.40.2", - "@dprint/linux-arm64-glibc": "0.40.2", - "@dprint/linux-x64-glibc": "0.40.2", - "@dprint/linux-x64-musl": "0.40.2", - "@dprint/win32-x64": "0.40.2" + "@dprint/darwin-arm64": "0.41.0", + "@dprint/darwin-x64": "0.41.0", + "@dprint/linux-arm64-glibc": "0.41.0", + "@dprint/linux-x64-glibc": "0.41.0", + "@dprint/linux-x64-musl": "0.41.0", + "@dprint/win32-x64": "0.41.0" } }, "emoji-regex": { diff --git a/package.json b/package.json index 75ca0cc206a..9d13170e71d 100644 --- a/package.json +++ b/package.json @@ -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",