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

Tools: Improve configuration for formatting files #40994

Merged
merged 1 commit into from
May 12, 2022
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
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ insert_final_newline = true
trim_trailing_whitespace = true
indent_style = tab

[*.{yml,yaml}]
indent_style = space
indent_size = 2

[*.{gradle,java,kt}]
indent_style = space

Expand Down
20 changes: 10 additions & 10 deletions .github/ISSUE_TEMPLATE/Bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
Feature '...' is not working properly. I expect '...' to happen, but '...' happens instead
validations:
required: true

- type: textarea
attributes:
label: Step-by-step reproduction instructions
Expand Down Expand Up @@ -42,31 +42,31 @@ body:
description: |
Please list what Gutenberg version you are using. If you aren't using Gutenberg, please note that it's not installed.
placeholder: |
- WordPress version, Gutenberg version, and active Theme you are using.
- Browser(s) are you seeing the problem on.
- Device you are using and operating system (e.g. "Desktop with Windows 10", "iPhone with iOS 14", etc.).
- WordPress version, Gutenberg version, and active Theme you are using.
- Browser(s) are you seeing the problem on.
- Device you are using and operating system (e.g. "Desktop with Windows 10", "iPhone with iOS 14", etc.).
validations:
required: false

- type: dropdown
id: existing
attributes:
label: Please confirm that you have searched existing issues in the repo.
description: You can do this by searching https://github.com/WordPress/gutenberg/issues and making sure the bug is not related to another plugin.
multiple: true
options:
- 'Yes'
- 'No'
- 'Yes'
- 'No'
validations:
required: true

- type: dropdown
id: plugins
attributes:
label: Please confirm that you have tested with all plugins deactivated except Gutenberg.
multiple: true
options:
- 'Yes'
- 'No'
- 'Yes'
- 'No'
validations:
required: true
7 changes: 1 addition & 6 deletions .npmpackagejsonlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
"prefer-no-devDependencies": "error",
"require-publishConfig": "error",
"require-repository-directory": "error",
"valid-values-author": [
"error",
[
"The WordPress Contributors"
]
],
"valid-values-author": [ "error", [ "The WordPress Contributors" ] ],
"valid-values-publishConfig": [
"error",
[
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ build-types
packages/block-serialization-spec-parser/parser.js
packages/e2e-tests/plugins
packages/react-native-editor/bundle
packages/url/src/test/fixtures
vendor
4 changes: 2 additions & 2 deletions bin/plugin/commands/test/fixtures/bot-pull-requests.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{
{
"url": "https://api.github.com/repos/WordPress/gutenberg/issues/XXXX",
"repository_url": "https://api.github.com/repos/WordPress/gutenberg",
"labels_url": "https://api.github.com/repos/WordPress/gutenberg/issues/XXXX/labels{/name}",
Expand Down Expand Up @@ -106,4 +106,4 @@
"body": "<!-- Learn the overall process and best practices for pull requests at https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/repository-management.md#pull-requests. -->\r\n\r\n## Description\r\n<!-- Please describe what you have changed or added -->\r\n\r\nRelated: #22890 his PR refactors the `MetaBoxesArea` component into a function component using React hooks.\r\n\r\n## How has this been tested?\r\n<!-- Please describe in detail how you tested your changes. -->\r\n<!-- Include details of your testing environment, tests ran to see how -->\r\n<!-- your change affects other areas of the code, etc. -->\r\n\r\nShow block editor and check custom field metabox and others.\r\n\r\n## Checklist:\r\n- [x] My code is tested.\r\n- [x] My code follows the WordPress code style. <!-- Check code: `npm run lint`, Guidelines: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/javascript/ -->\r\n- [x] My code follows the accessibility standards. <!-- Guidelines: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/accessibility/ -->\r\n- [x] I've tested my changes with keyboard and screen readers. <!-- Instructions: https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/accessibility-testing.md -->\r\n- [ ] My code has proper inline documentation. <!-- Guidelines: https://developer.wordpress.org/coding-standards/inline-documentation-standards/javascript/ -->\r\n- [ ] I've included developer documentation if appropriate. <!-- Handbook: https://developer.wordpress.org/block-editor/ -->\r\n- [ ] I've updated all React Native files affected by any refactorings/renamings in this PR (please manually search all `*.native.js` files for terms that need renaming or removal). <!-- React Native mobile Gutenberg guidelines: https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/code/native-mobile.md -->\r\n",
"performed_via_github_app": null
}
]
]
14 changes: 9 additions & 5 deletions docs/toc.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@
{
"docs/how-to-guides/data-basics/README.md": [
{
"docs/how-to-guides/data-basics/1-data-basics-setup.md": []
"docs/how-to-guides/data-basics/1-data-basics-setup.md": []
},
{
"docs/how-to-guides/data-basics/2-building-a-list-of-pages.md": []
"docs/how-to-guides/data-basics/2-building-a-list-of-pages.md": []
},
{
"docs/how-to-guides/data-basics/3-building-an-edit-form.md": []
"docs/how-to-guides/data-basics/3-building-an-edit-form.md": []
}
]
},
Expand Down Expand Up @@ -278,7 +278,9 @@
"docs/explanations/user-interface/README.md": [
{ "docs/explanations/user-interface/block-design.md": [] },
{ "docs/explanations/user-interface/animation.md": [] },
{ "docs/explanations/user-interface/design-resources.md": [] }
{
"docs/explanations/user-interface/design-resources.md": []
}
]
},
{ "docs/explanations/faq.md": [] },
Expand Down Expand Up @@ -318,7 +320,9 @@
},
{ "docs/contributors/code/backward-compatibility.md": [] },
{ "docs/contributors/code/deprecations.md": [] },
{ "docs/contributors/code/how-to-get-your-pull-request-reviewed.md": [] }
{
"docs/contributors/code/how-to-get-your-pull-request-reviewed.md": []
}
]
},
{
Expand Down
50 changes: 25 additions & 25 deletions lib/compat/wordpress-6.0/theme-i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
"title": "Style variation name",
"settings": {
"typography": {
"fontSizes": [
{
"name": "Font size name"
}
],
"fontFamilies": [
{
"name": "Font family name"
}
]
"fontSizes": [
{
"name": "Font size name"
}
],
"fontFamilies": [
{
"name": "Font family name"
}
]
},
"color": {
"palette": [
{
"name": "Color name"
}
],
"gradients": [
{
"name": "Gradient name"
}
],
"duotone": [
{
"name": "Duotone name"
}
]
"palette": [
{
"name": "Color name"
}
],
"gradients": [
{
"name": "Gradient name"
}
],
"duotone": [
{
"name": "Duotone name"
}
]
},
"blocks": {
"*": {
Expand Down
Loading