diff --git a/.editorconfig b/.editorconfig index 37dbdc135..8e5039cd1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -34,6 +34,15 @@ tab_width = 2 [*.json] indent_size = 2 +tab_width = 2 + +[*.jsonc] +indent_size = 2 +tab_width = 2 + +[*.json5] +indent_size = 2 +tab_width = 2 [*.toml] indent_size = 2 diff --git a/.prettierrc.yaml b/.prettierrc.yaml index d228df8d2..2654e60a4 100644 --- a/.prettierrc.yaml +++ b/.prettierrc.yaml @@ -22,5 +22,6 @@ quoteProps: as-needed semi: false singleAttributePerLine: false singleQuote: false +tabWidth: 2 trailingComma: "es5" # Note that printWidth, useTabs, tabWidth, endOfLine is read from .editorconfig by Prettier diff --git a/.renovaterc.json5 b/.renovaterc.json5 new file mode 100644 index 000000000..495bbc781 --- /dev/null +++ b/.renovaterc.json5 @@ -0,0 +1,5 @@ +{ + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: ["config:base"], + labels: ["dependencies"], +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 0735a8887..d494a2171 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -30,6 +30,10 @@ "markdown.validate.fragmentLinks.enabled": "error", "markdown.validate.fileLinks.markdownFragmentLinks": "error", + "[json5]": { + "editor.tabSize": 2 + }, + "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, diff --git a/renovate.json b/renovate.json deleted file mode 100644 index d6c85b7fa..000000000 --- a/renovate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:base"], - "labels": ["dependencies"] -}