Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump prettier from 3.1.1 to 3.2.2 #17901

Merged
merged 2 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .markdownlint-cli2.jsonc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"config": {
"extends": "./.markdownlint.jsonc"
"extends": "./.markdownlint.jsonc",
},
"customRules": ["markdownlint-rule-search-replace"],
"ignores": [
"node_modules",
".git",
".github",
"**/conflicting/**",
"**/orphaned/**"
]
"**/orphaned/**",
],
}
48 changes: 24 additions & 24 deletions .markdownlint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
// Disabled, as some callouts include headings.
"heading-increment": false,
"ul-style": {
"style": "dash"
"style": "dash",
},
"ul-indent": {
"indent": 2
"indent": 2,
},
"no-hard-tabs": {
"spaces_per_tab": 2
"spaces_per_tab": 2,
},
"line-length": false,
"no-duplicate-heading": false,
Expand All @@ -21,16 +21,16 @@
// "allow_different_nesting": true
// },
"single-title": {
"front_matter_title": "^\\s*title\\s*[:=]"
"front_matter_title": "^\\s*title\\s*[:=]",
},
"no-trailing-punctuation": {
"punctuation": ".,;:"
"punctuation": ".,;:",
},
// Consecutive Notes/Callouts currently don't conform with this rule
"no-blanks-blockquote": false,
// Force ordered numbering to catch accidental list ending from indenting
"ol-prefix": {
"style": "ordered"
"style": "ordered",
},
"no-inline-html": {
"allowed_elements": [
Expand Down Expand Up @@ -108,8 +108,8 @@
"i", // French translations use this for English literal text
"h2", // XXX Not always converted currently because of live samples using English IDs
"h3", // XXX Not always converted currently because of live samples using English IDs
"h6" // XXX Not always converted currently because of live samples using English IDs
]
"h6", // XXX Not always converted currently because of live samples using English IDs
],
},
"no-bare-urls": false,
// XXX Fixed upstream, remove next line when fixed here
Expand All @@ -122,7 +122,7 @@
// XXX Fixed upstream, remove next line when fixed here
"no-alt-text": false,
"code-block-style": {
"style": "fenced"
"style": "fenced",
},
"no-space-in-code": false,
"emphasis-style": false,
Expand All @@ -131,7 +131,7 @@
// "style": "underscore"
// },
"strong-style": {
"style": "asterisk"
"style": "asterisk",
},
// Disabled, as yari generates link fragments by replacing spaces with underscores, not dashes.
"link-fragments": false,
Expand All @@ -147,79 +147,79 @@
"message": "Don't use curly double quotes",
"searchPattern": "/“|”/g",
"replace": "\"",
"searchScope": "text"
"searchScope": "text",
},
{
// Does not apply to zh-cn
"name": "curly-single-quotes",
"message": "Don't use curly single quotes",
"searchPattern": "/‘|’/g",
"replace": "'",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "nbsp",
"message": "Don't use no-break spaces",
"searchPattern": "/ /g",
"replace": " ",
"searchScope": "all"
"searchScope": "all",
},
{
// zh-cn/zh-tw prefers double em-dash instead
"name": "em-dash",
"message": "Don't use '--'. Use em-dash (—) instead",
"search": " -- ",
"replace": " — ",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "relative-link",
"message": "Internal links should start with '/'",
"searchPattern": "/([\\(\"])([\\w\\-]+)\\/docs/g",
"replace": "$1/$2/docs",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "relative-link-path",
"message": "Don't use relative paths",
"search": "](..",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "trailing-spaces",
"message": "Avoid trailing spaces",
"searchPattern": "/ +$/gm",
"replace": "",
"searchScope": "all"
"searchScope": "all",
},
{
"name": "double-spaces",
"message": "Avoid double spaces",
"searchPattern": "/([^\\s>]) ([^\\s|])/g",
"replace": "$1 $2",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "stuck-definition",
"message": "Character is stuck to definition description marker",
"searchPattern": "/- :(\\w)/g",
"replace": "- : $1",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "fqdn-moz-links",
"message": "Don't use developer.mozilla.org for links, except for blog posts",
"searchPattern": "/\\]\\(https:\\/\\/developer.mozilla.org\\/(?!en-US\\/blog\\/)/g",
"replace": "](/",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "localhost-links",
"message": "Don't use localhost for links",
"searchPattern": "/\\]\\(https?:\\/\\/localhost:\\d+\\//g",
"replace": "](/",
"searchScope": "text"
}
]
}
"searchScope": "text",
},
],
},
}
2 changes: 1 addition & 1 deletion docs/zh-cn/.markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "../../files/zh-cn/.markdownlint.jsonc"
"extends": "../../files/zh-cn/.markdownlint.jsonc",
}
2 changes: 1 addition & 1 deletion docs/zh-tw/.markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "../../files/zh-tw/.markdownlint.jsonc"
"extends": "../../files/zh-tw/.markdownlint.jsonc",
}
4 changes: 2 additions & 2 deletions files/ja/.markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "../../.markdownlint.jsonc",
"no-trailing-punctuation": {
"punctuation": ".,;:。、;:"
}
"punctuation": ".,;:。、;:",
},
}
28 changes: 14 additions & 14 deletions files/zh-cn/.markdownlint.jsonc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../.markdownlint.jsonc",
"no-trailing-punctuation": {
"punctuation": ".,;:。,"
"punctuation": ".,;:。,",
},
"search-replace": {
"rules": [
Expand All @@ -10,69 +10,69 @@
"message": "Don't use no-break spaces",
"searchPattern": "/ /g",
"replace": " ",
"searchScope": "all"
"searchScope": "all",
},
{
"name": "double-em-dash",
"message": "Don't use '--'. Use double em-dash (——) instead",
"search": " -- ",
"replace": "——",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "relative-link",
"message": "Internal links should start with '/'",
"searchPattern": "/([\\(\"])([\\w\\-]+)\\/docs/g",
"replace": "$1/$2/docs",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "relative-link-path",
"message": "Don't use relative paths",
"search": "](..",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "trailing-spaces",
"message": "Avoid trailing spaces",
"searchPattern": "/ +$/gm",
"replace": "",
"searchScope": "all"
"searchScope": "all",
},
{
"name": "double-spaces",
"message": "Avoid double spaces",
"searchPattern": "/([^\\s>]) ([^\\s|])/g",
"replace": "$1 $2",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "stuck-definition",
"message": "Character is stuck to definition description marker",
"searchPattern": "/- :(\\w)/g",
"replace": "- : $1",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "fqdn-moz-links",
"message": "Don't use developer.mozilla.org for links, except for blog posts",
"searchPattern": "/\\]\\(https:\\/\\/developer.mozilla.org\\/(?!en-US\\/blog\\/)/g",
"replace": "](/",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "localhost-links",
"message": "Don't use localhost for links",
"searchPattern": "/\\]\\(https?:\\/\\/localhost:\\d+\\//g",
"replace": "](/",
"searchScope": "text"
"searchScope": "text",
},
{
"name": "force-pronoun",
"message": "Consider using '你' instead of '您'",
"searchPattern": "/您/g",
"searchScope": "text"
}
]
}
"searchScope": "text",
},
],
},
}
Loading