Merge pull request #5 from WordPress/master

Merge master from gutenberg

.eslintignore

@@ -6,7 +6,5 @@ node_modules
 packages/block-serialization-spec-parser/parser.js
 packages/e2e-tests/plugins
 packages/react-native-editor/bundle
-playground/dist
 vendor
-wordpress
 !.*.js

.eslintrc.js

@@ -34,7 +34,6 @@ module.exports = {
 		'plugin:@wordpress/eslint-plugin/recommended',
 		'plugin:eslint-comments/recommended',
 	],
-	plugins: [ 'import' ],
 	globals: {
 		wp: 'off',
 	},
@@ -54,6 +53,35 @@ module.exports = {
 				allowedTextDomain: 'default',
 			},
 		],
+		'@wordpress/no-unsafe-wp-apis': 'off',
+		'no-restricted-imports': [
+			'error',
+			{
+				paths: [
+					{
+						name: 'lodash',
+						importNames: [ 'memoize' ],
+						message: 'Please use `memize` instead.',
+					},
+					{
+						name: 'react',
+						message:
+							'Please use React API through `@wordpress/element` instead.',
+					},
+					{
+						name: 'reakit',
+						message:
+							'Please use Reakit API through `@wordpress/components` instead.',
+					},
+					{
+						name: 'redux',
+						importNames: [ 'combineReducers' ],
+						message:
+							'Please use `combineReducers` from `@wordpress/data` instead.',
+					},
+				],
+			},
+		],
 		'no-restricted-syntax': [
 			'error',
 			// NOTE: We can't include the forward slash in our regex or
@@ -81,17 +109,13 @@ module.exports = {
 			},
 			{
 				selector:
-					'ImportDeclaration[source.value="redux"] Identifier.imported[name="combineReducers"]',
-				message: 'Use `combineReducers` from `@wordpress/data`',
-			},
-			{
-				selector:
-					'ImportDeclaration[source.value="lodash"] Identifier.imported[name="memoize"]',
-				message: 'Use memize instead of Lodash’s memoize',
+					'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
+				message:
+					'This method is deprecated. You should use the more explicit API methods available.',
 			},
 			{
 				selector:
-					'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
+					'CallExpression[callee.object.name="page"][callee.property.name="waitForTimeout"]',
 				message: 'Prefer page.waitForSelector instead.',
 			},
 			{
@@ -121,21 +145,13 @@ module.exports = {
 					'Avoid truthy checks on length property rendering, as zero length is rendered verbatim.',
 			},
 		],
-		// Temporarily converted to warning until all errors are resolved.
-		// See https://github.com/WordPress/gutenberg/pull/22771 for the eslint-plugin-jsdoc update.
-		'jsdoc/check-param-names': 'warn',
-		'jsdoc/require-param': 'warn',
 	},
 	overrides: [
 		{
-			files: [ 'packages/**/*.js' ],
-			excludedFiles: [
-				'**/*.@(android|ios|native).js',
-				...developmentFiles,
-			],
+			files: [ '**/*.@(android|ios|native).js', ...developmentFiles ],
 			rules: {
-				'import/no-extraneous-dependencies': 'error',
-				'import/no-unresolved': 'error',
+				'import/no-extraneous-dependencies': 'off',
+				'import/no-unresolved': 'off',
 			},
 		},
 		{

.github/CODEOWNERS

@@ -11,19 +11,19 @@
 /packages/data-controls                         @nerrad
 
 # Blocks
-/packages/block-library                         @ajitbohra @talldan
+/packages/block-library                         @ajitbohra
 /packages/block-library/src/gallery             @mkevins
 /packages/block-library/src/social-links        @mkaz
 /packages/block-library/src/social-link         @mkaz
 /packages/block-library/src/image               @ajlende
 
 # Editor
-/packages/annotations                           @atimmer @ellatrix
+/packages/annotations                           @atimmer
 /packages/autop
 /packages/block-editor                          @ellatrix
 /packages/block-serialization-spec-parser       @dmsnell
 /packages/block-serialization-default-parser    @dmsnell
-/packages/blocks                                @ellatrix
+/packages/blocks
 /packages/edit-post
 /packages/editor
 /packages/list-reusable-blocks
@@ -54,7 +54,7 @@
 /packages/custom-templated-path-webpack-plugin  @ntwb @nerrad @ajitbohra
 /packages/docgen                                @nosolosw
 /packages/e2e-test-utils                        @gziolo @ntwb @nerrad @ajitbohra
-/packages/e2e-tests                             @ntwb @nerrad @ajitbohra @talldan
+/packages/e2e-tests                             @ntwb @nerrad @ajitbohra
 /packages/eslint-plugin                         @gziolo @ntwb @nerrad @ajitbohra
 /packages/jest-console                          @gziolo @ntwb @nerrad @ajitbohra
 /packages/jest-preset-default                   @gziolo @ntwb @nerrad @ajitbohra
@@ -88,10 +88,10 @@
 /packages/html-entities
 /packages/i18n                                  @swissspidy
 /packages/is-shallow-equal
-/packages/keycodes                              @talldan @ellatrix
+/packages/keycodes
 /packages/priority-queue
 /packages/token-list
-/packages/url                                   @talldan
+/packages/url
 /packages/wordcount
 /packages/warning
 /packages/keyboard-shortcuts
@@ -116,6 +116,9 @@
 /lib                                            @timothybjacobs @spacedmonkey
 /lib/global-styles.php                          @timothybjabocs @spacedmonkey @nosolosw
 /lib/experimental-default-theme.json            @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json.php                    @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json-resolver.php           @timothybjabocs @spacedmonkey @nosolosw
+/phpunit/class-wp-theme-json-test.php           @nosolosw
 
 # Native (Unowned)
 *.native.js                                     @ghost

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,40 +1,68 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report a bug with the WordPress block editor or Gutenberg plugin
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+<!--
+Please fill out ALL required sections. Bug reports with missing information will
+be closed.
 
-**To reproduce**
-Steps to reproduce the behavior:
+Before submitting a bug report:
+
+- Check if the bug has already been fixed by updating WordPress and/or Gutenberg.
+- Check if the bug is caused by a plugin by deactivating all plugins except Gutenberg.
+- Check if the bug is caused by a theme by activating a default theme e.g. Twenty Twenty.
+- Check if the bug has already been reported by searching https://github.com/WordPress/gutenberg/issues.
+
+If this is a security issue, please report it in HackerOne instead:
+https://hackerone.com/wordpress
+-->
+
+## Description
+<!-- Please write a brief description of the bug. -->
+
+## Step-by-step reproduction instructions
+<!--
+Please list the steps needed to reproduce the bug. For example:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Editor version (please complete the following information):**
-- WordPress version: [e.g: 5.3.2]
-- Does the website has Gutenberg plugin installed, or is it using the block editor that comes by default? [e.g: "gutenberg plugin", "default"]
-- If the Gutenberg plugin is installed, which version is it? [e.g., 7.6]
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-- To report a security issue, please visit the WordPress HackerOne program: https://hackerone.com/wordpress.
+2. Click on '...'
+3. Scroll down to '...'
+-->
+
+## Expected behaviour
+<!-- Please describe what you expected to happen. -->
+
+## Actual behaviour
+<!-- Please describe what actually happened. -->
+
+## Screenshots or screen recording (optional)
+<!--
+If possible, please upload a screenshot or screen recording which demonstrates
+the bug. You can use LIEcap to create a GIF screen recording:
+https://www.cockos.com/licecap/
+-->
+
+## Code snippet (optional)
+<!--
+If this bug is to related to a developer API, please share a code snippet that
+demonstrates the issue.
+
+For small snippets paste it directly here, or you can use GitHub Gist to share
+multiple code files: https://gist.github.com
+
+Please ensure the shared code can be used by a developer to reproduce the
+issue—ideally it can be copied into a local development environment or executed
+in a browser console to help debug the issue.
+-->
+
+## WordPress information
+- WordPress version: <!-- e.g. "5.6.0". Find this in Tools → Site Health → Info → WordPress -->
+- Gutenberg version: <!-- e.g. "9.4.0" or "Not installed" -->
+- Are all plugins except Gutenberg deactivated? <!-- "Yes" or "No" -->
+- Are you using a default theme (e.g. Twenty Twenty-One)? <!-- "Yes" or "No" -->
+
+## Device information
+- Device: <!-- e.g. "Desktop" or "iPhone 11" -->
+- Operating system: <!-- e.g. "Windows 10" or "iOS 14" -->
+- Browser: <!-- e.g. "Chrome 86.0" or "Mobile Safari" -->

.github/ISSUE_TEMPLATE/Bug_report_mobile.md

@@ -0,0 +1,55 @@
+---
+name: Bug report (Mobile)
+about: Report a bug with the mobile app version of Gutenberg
+labels: Mobile App Android/iOS
+
+---
+
+<!--
+Please fill out ALL required sections. Bug reports with missing information will
+be closed.
+
+Before submitting a bug report:
+
+- Check if the bug has already been fixed by updating WordPress and/or Gutenberg.
+- Check if the bug is caused by a plugin by deactivating all plugins except Gutenberg.
+- Check if the bug is caused by a theme by activating a default theme e.g. Twenty Twenty.
+- Check if the bug has already been reported by searching https://github.com/WordPress/gutenberg/issues.
+
+If this is a security issue, please report it in HackerOne instead:
+https://hackerone.com/wordpress
+-->
+
+## Description
+<!-- Please write a brief description of the bug. -->
+
+## Step-by-step reproduction instructions
+<!--
+Please list the steps needed to reproduce the bug. For example:
+1. Go to '...'
+2. Click on '...'
+3. Scroll down to '...'
+-->
+
+## Expected behaviour
+<!-- Please describe what you expected to happen. -->
+
+## Actual behaviour
+<!-- Please describe what actually happened. -->
+
+## Screenshots or screen recording (optional)
+<!--
+If possible, please upload a screenshot or screen recording which demonstrates
+the bug. 
+-->
+
+## WordPress information
+- WordPress version: <!-- e.g. "5.6.0". Find this in Tools → Site Health → Info → WordPress -->
+- Gutenberg version: <!-- e.g. "9.4.0" or "Not installed" -->
+- Are all plugins except Gutenberg deactivated? <!-- "Yes" or "No" -->
+- Are you using a default theme (e.g. Twenty Twenty-One)? <!-- "Yes" or "No" -->
+
+## Device information
+- Device: <!-- e.g. "Pixel 4" or "iPhone 11" -->
+- Operating system: <!-- e.g. "Android 11.0" or "iOS 14.0" -->
+- WordPress app version: <!-- e.g. "16.3" or branch name / git commit hash -->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,14 +1,18 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Propose an idea for a feature or an enhancement
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## What problem does this address?
+<!--
+Please describe if this feature or enhancement is related to a current problem
+or pain point. For example, "I'm always frustrated when ..." or "It is currently
+difficult to ...".
+-->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## What is your proposed solution?
+<!--
+Please outline the feature or enhancement that you want and how it addresses any
+problem identified above.
+-->