diff options
| -rw-r--r-- | .dprintrc.json | 13 | ||||
| -rw-r--r-- | Cargo.lock | 12 | ||||
| -rw-r--r-- | cli/Cargo.toml | 4 | ||||
| -rw-r--r-- | cli/tools/fmt.rs | 6 | ||||
| -rw-r--r-- | docs/getting_started/webassembly.md | 2 | ||||
| -rw-r--r-- | docs/tools/script_installer.md | 2 |
6 files changed, 18 insertions, 21 deletions
diff --git a/.dprintrc.json b/.dprintrc.json index 113a6b20e..8ab3bc445 100644 --- a/.dprintrc.json +++ b/.dprintrc.json @@ -2,13 +2,14 @@ "$schema": "https://dprint.dev/schemas/v0.json", "projectType": "openSource", "incremental": true, - "lineWidth": 80, - "indentWidth": 2, "typescript": { "deno": true }, "markdown": { - "textWrap": "always" + "deno": true + }, + "json": { + "deno": true }, "includes": ["**/*.{ts,tsx,js,jsx,json,md}"], "excludes": [ @@ -34,8 +35,8 @@ "tools/wpt/manifest.json" ], "plugins": [ - "https://plugins.dprint.dev/typescript-0.40.3.wasm", - "https://plugins.dprint.dev/json-0.8.0.wasm", - "https://plugins.dprint.dev/markdown-0.5.1.wasm" + "https://plugins.dprint.dev/typescript-0.41.0.wasm", + "https://plugins.dprint.dev/json-0.9.0.wasm", + "https://plugins.dprint.dev/markdown-0.6.0.wasm" ] } diff --git a/Cargo.lock b/Cargo.lock index 54b1f0056..920563393 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -753,9 +753,9 @@ dependencies = [ [[package]] name = "dprint-core" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b96c278cf35e2dd2c225c16abcdbf46b2e39d3058426ac67b105f023ac148" +checksum = "a0edf9f35fbd32eb53b7e047cb1da4208c70e9c3643a733478fd7c99d98009b3" dependencies = [ "bumpalo", "fnv", @@ -764,9 +764,9 @@ dependencies = [ [[package]] name = "dprint-plugin-json" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b43a7746fa356617bb85828932170b5b6a35102b1d29978b0f1b388dbcd346" +checksum = "92e1e2cc629e68adce3eed0ce1bfb6c75aa6e53c0f0dda04d230fdf73d275f76" dependencies = [ "dprint-core", "jsonc-parser", @@ -775,9 +775,9 @@ dependencies = [ [[package]] name = "dprint-plugin-markdown" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dd3b8784047301e25e27ab168c79d86f883f65b83d26df31785cf4db144137" +checksum = "5600cc5d99205c6adfd79c825e4d6ac86581e9215c9b2d69a0448b0c2f2861a1" dependencies = [ "dprint-core", "pulldown-cmark", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7538606e9..3e5a018ff 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -44,9 +44,9 @@ base64 = "0.13.0" byteorder = "1.4.2" clap = "2.33.3" dissimilar = "1.0.2" +dprint-plugin-json = "0.9.0" +dprint-plugin-markdown = "0.6.0" dprint-plugin-typescript = "0.41.0" -dprint-plugin-markdown = "0.5.1" -dprint-plugin-json = "0.8.0" encoding_rs = "0.8.28" env_logger = "0.8.2" filetime = "0.2.14" diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs index 6afcb90af..1385f849a 100644 --- a/cli/tools/fmt.rs +++ b/cli/tools/fmt.rs @@ -316,11 +316,7 @@ fn get_typescript_config( fn get_markdown_config() -> dprint_plugin_markdown::configuration::Configuration { dprint_plugin_markdown::configuration::ConfigurationBuilder::new() - // Matches `.dprintrc.json` in the repository - .text_wrap(dprint_plugin_markdown::configuration::TextWrap::Always) - .ignore_directive("deno-fmt-ignore") - .ignore_start_directive("deno-fmt-ignore-start") - .ignore_end_directive("deno-fmt-ignore-end") + .deno() .build() } diff --git a/docs/getting_started/webassembly.md b/docs/getting_started/webassembly.md index a960b6614..4aa1f35e4 100644 --- a/docs/getting_started/webassembly.md +++ b/docs/getting_started/webassembly.md @@ -4,7 +4,7 @@ Deno can execute [WebAssembly](https://webassembly.org/) modules with the same interfaces that [browsers provide](https://developer.mozilla.org/en-US/docs/WebAssembly). -<!-- dprint-ignore --> +<!-- deno-fmt-ignore --> ```ts const wasmCode = new Uint8Array([ diff --git a/docs/tools/script_installer.md b/docs/tools/script_installer.md index 54ced70f6..b5046719e 100644 --- a/docs/tools/script_installer.md +++ b/docs/tools/script_installer.md @@ -67,7 +67,7 @@ idiom to specify the entry point in an executable script. Example: -<!-- dprint-ignore --> +<!-- deno-fmt-ignore --> ```ts // https://example.com/awesome/cli.ts |