From a9c58d5e51d5d7060abdd6d6b3de12e98e960ef6 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 6 May 2021 00:22:24 -0400 Subject: chore: upgrade dprint 0.13.1 to fix CI. (#10513) --- .dprint.json | 42 ++++++++++++++++++++++++++++++++++++++++++ .dprintrc.json | 42 ------------------------------------------ third_party | 2 +- tools/format.js | 2 +- 4 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 .dprint.json delete mode 100644 .dprintrc.json diff --git a/.dprint.json b/.dprint.json new file mode 100644 index 000000000..340693e0d --- /dev/null +++ b/.dprint.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://dprint.dev/schemas/v0.json", + "projectType": "openSource", + "incremental": true, + "typescript": { + "deno": true + }, + "markdown": { + "deno": true + }, + "json": { + "deno": true + }, + "includes": ["**/*.{ts,tsx,js,jsx,json,md}"], + "excludes": [ + ".cargo_home", + ".git", + "cli/dts/lib.d.ts", + "cli/dts/lib.dom*", + "cli/dts/lib.es*", + "cli/dts/lib.scripthost.d.ts", + "cli/dts/lib.webworker*.d.ts", + "cli/dts/typescript.d.ts", + "cli/tests/encoding", + "cli/tests/inline_js_source_map*", + "cli/tests/badly_formatted.md", + "cli/tests/badly_formatted.json", + "cli/tsc/*typescript.js", + "test_util/std", + "test_util/wpt", + "gh-pages", + "target", + "third_party", + "tools/wpt/expectation.json", + "tools/wpt/manifest.json" + ], + "plugins": [ + "https://plugins.dprint.dev/typescript-0.44.2.wasm", + "https://plugins.dprint.dev/json-0.10.2.wasm", + "https://plugins.dprint.dev/markdown-0.7.1.wasm" + ] +} diff --git a/.dprintrc.json b/.dprintrc.json deleted file mode 100644 index 340693e0d..000000000 --- a/.dprintrc.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "$schema": "https://dprint.dev/schemas/v0.json", - "projectType": "openSource", - "incremental": true, - "typescript": { - "deno": true - }, - "markdown": { - "deno": true - }, - "json": { - "deno": true - }, - "includes": ["**/*.{ts,tsx,js,jsx,json,md}"], - "excludes": [ - ".cargo_home", - ".git", - "cli/dts/lib.d.ts", - "cli/dts/lib.dom*", - "cli/dts/lib.es*", - "cli/dts/lib.scripthost.d.ts", - "cli/dts/lib.webworker*.d.ts", - "cli/dts/typescript.d.ts", - "cli/tests/encoding", - "cli/tests/inline_js_source_map*", - "cli/tests/badly_formatted.md", - "cli/tests/badly_formatted.json", - "cli/tsc/*typescript.js", - "test_util/std", - "test_util/wpt", - "gh-pages", - "target", - "third_party", - "tools/wpt/expectation.json", - "tools/wpt/manifest.json" - ], - "plugins": [ - "https://plugins.dprint.dev/typescript-0.44.2.wasm", - "https://plugins.dprint.dev/json-0.10.2.wasm", - "https://plugins.dprint.dev/markdown-0.7.1.wasm" - ] -} diff --git a/third_party b/third_party index 72f5f1a9f..3bd4e3652 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 72f5f1a9fa3274ed9de313a752bbfe3afa7d39d2 +Subproject commit 3bd4e3652304eb97177e1fc217943529322f4680 diff --git a/tools/format.js b/tools/format.js index af08d0395..a21bcd64e 100755 --- a/tools/format.js +++ b/tools/format.js @@ -3,7 +3,7 @@ import { getPrebuiltToolPath, getSources, join, ROOT_PATH } from "./util.js"; async function dprint() { - const configFile = join(ROOT_PATH, ".dprintrc.json"); + const configFile = join(ROOT_PATH, ".dprint.json"); const execPath = getPrebuiltToolPath("dprint"); console.log("dprint"); const p = Deno.run({ -- cgit v1.2.3