Skip to content

Commit 07b4b8b

Browse files
authored
Merge pull request #5 from WordPress/master
Merge master from gutenberg
2 parents 3c570b6 + 2e8d260 commit 07b4b8b

File tree

1,525 files changed

+37316
-37966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,525 files changed

+37316
-37966
lines changed

.eslintignore

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@ node_modules
66
packages/block-serialization-spec-parser/parser.js
77
packages/e2e-tests/plugins
88
packages/react-native-editor/bundle
9-
playground/dist
109
vendor
11-
wordpress
1210
!.*.js

.eslintrc.js

+36-20
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ module.exports = {
3434
'plugin:@wordpress/eslint-plugin/recommended',
3535
'plugin:eslint-comments/recommended',
3636
],
37-
plugins: [ 'import' ],
3837
globals: {
3938
wp: 'off',
4039
},
@@ -54,6 +53,35 @@ module.exports = {
5453
allowedTextDomain: 'default',
5554
},
5655
],
56+
'@wordpress/no-unsafe-wp-apis': 'off',
57+
'no-restricted-imports': [
58+
'error',
59+
{
60+
paths: [
61+
{
62+
name: 'lodash',
63+
importNames: [ 'memoize' ],
64+
message: 'Please use `memize` instead.',
65+
},
66+
{
67+
name: 'react',
68+
message:
69+
'Please use React API through `@wordpress/element` instead.',
70+
},
71+
{
72+
name: 'reakit',
73+
message:
74+
'Please use Reakit API through `@wordpress/components` instead.',
75+
},
76+
{
77+
name: 'redux',
78+
importNames: [ 'combineReducers' ],
79+
message:
80+
'Please use `combineReducers` from `@wordpress/data` instead.',
81+
},
82+
],
83+
},
84+
],
5785
'no-restricted-syntax': [
5886
'error',
5987
// NOTE: We can't include the forward slash in our regex or
@@ -81,17 +109,13 @@ module.exports = {
81109
},
82110
{
83111
selector:
84-
'ImportDeclaration[source.value="redux"] Identifier.imported[name="combineReducers"]',
85-
message: 'Use `combineReducers` from `@wordpress/data`',
86-
},
87-
{
88-
selector:
89-
'ImportDeclaration[source.value="lodash"] Identifier.imported[name="memoize"]',
90-
message: 'Use memize instead of Lodash’s memoize',
112+
'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
113+
message:
114+
'This method is deprecated. You should use the more explicit API methods available.',
91115
},
92116
{
93117
selector:
94-
'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
118+
'CallExpression[callee.object.name="page"][callee.property.name="waitForTimeout"]',
95119
message: 'Prefer page.waitForSelector instead.',
96120
},
97121
{
@@ -121,21 +145,13 @@ module.exports = {
121145
'Avoid truthy checks on length property rendering, as zero length is rendered verbatim.',
122146
},
123147
],
124-
// Temporarily converted to warning until all errors are resolved.
125-
// See https://github.com/WordPress/gutenberg/pull/22771 for the eslint-plugin-jsdoc update.
126-
'jsdoc/check-param-names': 'warn',
127-
'jsdoc/require-param': 'warn',
128148
},
129149
overrides: [
130150
{
131-
files: [ 'packages/**/*.js' ],
132-
excludedFiles: [
133-
'**/*.@(android|ios|native).js',
134-
...developmentFiles,
135-
],
151+
files: [ '**/*.@(android|ios|native).js', ...developmentFiles ],
136152
rules: {
137-
'import/no-extraneous-dependencies': 'error',
138-
'import/no-unresolved': 'error',
153+
'import/no-extraneous-dependencies': 'off',
154+
'import/no-unresolved': 'off',
139155
},
140156
},
141157
{

.github/CODEOWNERS

+9-6
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
/packages/data-controls @nerrad
1212

1313
# Blocks
14-
/packages/block-library @ajitbohra @talldan
14+
/packages/block-library @ajitbohra
1515
/packages/block-library/src/gallery @mkevins
1616
/packages/block-library/src/social-links @mkaz
1717
/packages/block-library/src/social-link @mkaz
1818
/packages/block-library/src/image @ajlende
1919

2020
# Editor
21-
/packages/annotations @atimmer @ellatrix
21+
/packages/annotations @atimmer
2222
/packages/autop
2323
/packages/block-editor @ellatrix
2424
/packages/block-serialization-spec-parser @dmsnell
2525
/packages/block-serialization-default-parser @dmsnell
26-
/packages/blocks @ellatrix
26+
/packages/blocks
2727
/packages/edit-post
2828
/packages/editor
2929
/packages/list-reusable-blocks
@@ -54,7 +54,7 @@
5454
/packages/custom-templated-path-webpack-plugin @ntwb @nerrad @ajitbohra
5555
/packages/docgen @nosolosw
5656
/packages/e2e-test-utils @gziolo @ntwb @nerrad @ajitbohra
57-
/packages/e2e-tests @ntwb @nerrad @ajitbohra @talldan
57+
/packages/e2e-tests @ntwb @nerrad @ajitbohra
5858
/packages/eslint-plugin @gziolo @ntwb @nerrad @ajitbohra
5959
/packages/jest-console @gziolo @ntwb @nerrad @ajitbohra
6060
/packages/jest-preset-default @gziolo @ntwb @nerrad @ajitbohra
@@ -88,10 +88,10 @@
8888
/packages/html-entities
8989
/packages/i18n @swissspidy
9090
/packages/is-shallow-equal
91-
/packages/keycodes @talldan @ellatrix
91+
/packages/keycodes
9292
/packages/priority-queue
9393
/packages/token-list
94-
/packages/url @talldan
94+
/packages/url
9595
/packages/wordcount
9696
/packages/warning
9797
/packages/keyboard-shortcuts
@@ -116,6 +116,9 @@
116116
/lib @timothybjacobs @spacedmonkey
117117
/lib/global-styles.php @timothybjabocs @spacedmonkey @nosolosw
118118
/lib/experimental-default-theme.json @timothybjabocs @spacedmonkey @nosolosw
119+
/lib/class-wp-theme-json.php @timothybjabocs @spacedmonkey @nosolosw
120+
/lib/class-wp-theme-json-resolver.php @timothybjabocs @spacedmonkey @nosolosw
121+
/phpunit/class-wp-theme-json-test.php @nosolosw
119122

120123
# Native (Unowned)
121124
*.native.js @ghost

.github/ISSUE_TEMPLATE/Bug_report.md

+61-33
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,68 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve
3+
about: Report a bug with the WordPress block editor or Gutenberg plugin
44

55
---
66

7-
**Describe the bug**
8-
A clear and concise description of what the bug is.
7+
<!--
8+
Please fill out ALL required sections. Bug reports with missing information will
9+
be closed.
910
10-
**To reproduce**
11-
Steps to reproduce the behavior:
11+
Before submitting a bug report:
12+
13+
- Check if the bug has already been fixed by updating WordPress and/or Gutenberg.
14+
- Check if the bug is caused by a plugin by deactivating all plugins except Gutenberg.
15+
- Check if the bug is caused by a theme by activating a default theme e.g. Twenty Twenty.
16+
- Check if the bug has already been reported by searching https://github.com/WordPress/gutenberg/issues.
17+
18+
If this is a security issue, please report it in HackerOne instead:
19+
https://hackerone.com/wordpress
20+
-->
21+
22+
## Description
23+
<!-- Please write a brief description of the bug. -->
24+
25+
## Step-by-step reproduction instructions
26+
<!--
27+
Please list the steps needed to reproduce the bug. For example:
1228
1. Go to '...'
13-
2. Click on '....'
14-
3. Scroll down to '....'
15-
4. See error
16-
17-
**Expected behavior**
18-
A clear and concise description of what you expected to happen.
19-
20-
**Screenshots**
21-
If applicable, add screenshots to help explain your problem.
22-
23-
**Editor version (please complete the following information):**
24-
- WordPress version: [e.g: 5.3.2]
25-
- Does the website has Gutenberg plugin installed, or is it using the block editor that comes by default? [e.g: "gutenberg plugin", "default"]
26-
- If the Gutenberg plugin is installed, which version is it? [e.g., 7.6]
27-
28-
**Desktop (please complete the following information):**
29-
- OS: [e.g. iOS]
30-
- Browser [e.g. chrome, safari]
31-
- Version [e.g. 22]
32-
33-
**Smartphone (please complete the following information):**
34-
- Device: [e.g. iPhone6]
35-
- OS: [e.g. iOS8.1]
36-
- Browser [e.g. stock browser, safari]
37-
- Version [e.g. 22]
38-
39-
**Additional context**
40-
- To report a security issue, please visit the WordPress HackerOne program: https://hackerone.com/wordpress.
29+
2. Click on '...'
30+
3. Scroll down to '...'
31+
-->
32+
33+
## Expected behaviour
34+
<!-- Please describe what you expected to happen. -->
35+
36+
## Actual behaviour
37+
<!-- Please describe what actually happened. -->
38+
39+
## Screenshots or screen recording (optional)
40+
<!--
41+
If possible, please upload a screenshot or screen recording which demonstrates
42+
the bug. You can use LIEcap to create a GIF screen recording:
43+
https://www.cockos.com/licecap/
44+
-->
45+
46+
## Code snippet (optional)
47+
<!--
48+
If this bug is to related to a developer API, please share a code snippet that
49+
demonstrates the issue.
50+
51+
For small snippets paste it directly here, or you can use GitHub Gist to share
52+
multiple code files: https://gist.github.com
53+
54+
Please ensure the shared code can be used by a developer to reproduce the
55+
issue—ideally it can be copied into a local development environment or executed
56+
in a browser console to help debug the issue.
57+
-->
58+
59+
## WordPress information
60+
- WordPress version: <!-- e.g. "5.6.0". Find this in Tools → Site Health → Info → WordPress -->
61+
- Gutenberg version: <!-- e.g. "9.4.0" or "Not installed" -->
62+
- Are all plugins except Gutenberg deactivated? <!-- "Yes" or "No" -->
63+
- Are you using a default theme (e.g. Twenty Twenty-One)? <!-- "Yes" or "No" -->
64+
65+
## Device information
66+
- Device: <!-- e.g. "Desktop" or "iPhone 11" -->
67+
- Operating system: <!-- e.g. "Windows 10" or "iOS 14" -->
68+
- Browser: <!-- e.g. "Chrome 86.0" or "Mobile Safari" -->
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: Bug report (Mobile)
3+
about: Report a bug with the mobile app version of Gutenberg
4+
labels: Mobile App Android/iOS
5+
6+
---
7+
8+
<!--
9+
Please fill out ALL required sections. Bug reports with missing information will
10+
be closed.
11+
12+
Before submitting a bug report:
13+
14+
- Check if the bug has already been fixed by updating WordPress and/or Gutenberg.
15+
- Check if the bug is caused by a plugin by deactivating all plugins except Gutenberg.
16+
- Check if the bug is caused by a theme by activating a default theme e.g. Twenty Twenty.
17+
- Check if the bug has already been reported by searching https://github.com/WordPress/gutenberg/issues.
18+
19+
If this is a security issue, please report it in HackerOne instead:
20+
https://hackerone.com/wordpress
21+
-->
22+
23+
## Description
24+
<!-- Please write a brief description of the bug. -->
25+
26+
## Step-by-step reproduction instructions
27+
<!--
28+
Please list the steps needed to reproduce the bug. For example:
29+
1. Go to '...'
30+
2. Click on '...'
31+
3. Scroll down to '...'
32+
-->
33+
34+
## Expected behaviour
35+
<!-- Please describe what you expected to happen. -->
36+
37+
## Actual behaviour
38+
<!-- Please describe what actually happened. -->
39+
40+
## Screenshots or screen recording (optional)
41+
<!--
42+
If possible, please upload a screenshot or screen recording which demonstrates
43+
the bug.
44+
-->
45+
46+
## WordPress information
47+
- WordPress version: <!-- e.g. "5.6.0". Find this in Tools → Site Health → Info → WordPress -->
48+
- Gutenberg version: <!-- e.g. "9.4.0" or "Not installed" -->
49+
- Are all plugins except Gutenberg deactivated? <!-- "Yes" or "No" -->
50+
- Are you using a default theme (e.g. Twenty Twenty-One)? <!-- "Yes" or "No" -->
51+
52+
## Device information
53+
- Device: <!-- e.g. "Pixel 4" or "iPhone 11" -->
54+
- Operating system: <!-- e.g. "Android 11.0" or "iOS 14.0" -->
55+
- WordPress app version: <!-- e.g. "16.3" or branch name / git commit hash -->

.github/ISSUE_TEMPLATE/Custom.md

-17
This file was deleted.
+12-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
---
22
name: Feature request
3-
about: Suggest an idea for this project
3+
about: Propose an idea for a feature or an enhancement
44

55
---
66

7-
**Is your feature request related to a problem? Please describe.**
8-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
7+
## What problem does this address?
8+
<!--
9+
Please describe if this feature or enhancement is related to a current problem
10+
or pain point. For example, "I'm always frustrated when ..." or "It is currently
11+
difficult to ...".
12+
-->
913

10-
**Describe the solution you'd like**
11-
A clear and concise description of what you want to happen.
12-
13-
**Describe alternatives you've considered**
14-
A clear and concise description of any alternative solutions or features you've considered.
14+
## What is your proposed solution?
15+
<!--
16+
Please outline the feature or enhancement that you want and how it addresses any
17+
problem identified above.
18+
-->

.github/ISSUE_TEMPLATE/Mobile_apps_bug_report.md

-34
This file was deleted.

0 commit comments

Comments
 (0)