Merge branch 'trunk' into replace/confirm-et-al

* trunk: (214 commits)
  Fix snackbar overflow on nav editor (#34661)
  Mobile - Allow disabling text and background color via theme.json (#34633)
  Fix disabled blocks logical error on Widgets screen (#34634)
  [Mobile] - Global styles - Add support to render font sizes and line height (#34144)
  ESLint Plugin: Update eslint jsdoc dependency (#34338)
  Scripts: Add CHANGELOG entry for `jest-dev-server` upgrade (#34657)
  Bump jest-dev-server to v5 (#34560)
  Refactor the `core-data` store to thunks (#28389)
  Only capture toolbars on parent Nav block when not in vertical mode (#34615)
  Update Changelog for 11.5.0-rc.1
  Bump plugin version to 11.5.0-rc.1
  Gallery block: Fix media placeholder height in site editor (#34629)
  Border Controls: Display color indicator and check selected color (#34467)
  Remove horizontal and vertical navigation block variations from inserter (#34614)
  AlignmentMatrixControl : Fix/update docs (#34624)
  Gap block support: force gap change to cause the block to re-render (fix Safari issue) (#34567)
  [Block Library - Social Links]: Use the new `flex` layout (#34493)
  [Mobile] Update the bottom sheet header (#34309)
  Group block: Add a row variation (#34535)
  Migrate entities.js to thunks (#34582)
  ...

.eslintrc.js

@@ -104,7 +104,7 @@ module.exports = {
 					{
 						name: '@emotion/css',
 						message:
-							'Please use `@emotion/react` and `@emotion/styled` in order to maintain iframe support',
+							'Please use `@emotion/react` and `@emotion/styled` in order to maintain iframe support. As a replacement for the `cx` function, please use the `useCx` hook defined in `@wordpress/components` instead.',
 					},
 				],
 			},

.github/CODEOWNERS

@@ -40,9 +40,11 @@
 
 # Widgets
 /packages/edit-widgets                          @draganescu @talldan @noisysocks @tellthemachines @adamziel @kevin940726
+/packages/customize-widgets                     @noisysocks
+/packages/widgets                               @noisysocks
 
 # Navigation
-/packages/edit-navigation                       @draganescu @talldan @noisysocks @tellthemachines @adamziel @kevin940726 @getdave
+/packages/edit-navigation                       @draganescu @talldan @tellthemachines @adamziel @kevin940726 @getdave
 
 # Full Site Editing
 /packages/edit-site
@@ -125,6 +127,7 @@
 /lib/theme.json                                 @timothybjabocs @spacedmonkey @nosolosw
 /lib/class-wp-theme-json-gutenberg.php          @timothybjabocs @spacedmonkey @nosolosw
 /lib/class-wp-theme-json-resolver-gutenberg.php @timothybjabocs @spacedmonkey @nosolosw
+/lib/full-site-editing                          @janw-me
 /phpunit/class-wp-theme-json-test.php           @nosolosw
 
 # Web App

.github/ISSUE_TEMPLATE/Bug_report.yml

@@ -1,6 +1,5 @@
 name: Bug report
 description: Report a bug with the WordPress block editor or Gutenberg plugin
-title: '<title>'
 body:
     - type: markdown
       attributes:
@@ -49,10 +48,25 @@ body:
       validations:
           required: false
 
-    - type: checkboxes
+    - type: dropdown
+      id: existing
       attributes:
-          label: Pre-checks
-          description: Please check if the bug has already been reported by searching https://github.com/WordPress/gutenberg/issues and make sure the bug is not related to another plugin.
+          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:
-              - label: I have searched the existing issues.
-              - label: I have tested with all plugins deactivated except Gutenberg.
+             - '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'
+      validations:
+          required: true

.github/ISSUE_TEMPLATE/Bug_report_mobile.md

@@ -44,7 +44,7 @@ the bug.
 -->
 
 ## WordPress information
-- WordPress version: <!-- e.g. "5.6.0". Find this in Tools → Site Health → Info → WordPress -->
+- WordPress version: <!-- e.g. "5.8.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" -->

.github/workflows/rnmobile-android-runner.yml

@@ -15,9 +15,7 @@ concurrency:
 jobs:
     test:
         runs-on: macos-latest
-        # The false value below disables the test while we investigate a
-        # foundational error causing failures
-        if: ${{ false && (github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request') }}
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             matrix:
                 native-test-name: [gutenberg-editor-initial-html]
@@ -41,9 +39,10 @@ jobs:
                   path: ~/.gradle/caches
                   key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
 
-            - uses: reactivecircus/android-emulator-runner@d2799957d660add41c61a5103e2fbb9e2889eb73 # v2.15.0
+            - uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e # v2.19.1
               with:
                   api-level: 28
+                  emulator-build: 7425822 # https://git.io/JE3jX
                   profile: pixel_xl
                   script: npm run native test:e2e:android:local ${{ matrix.native-test-name }}
 

.github/workflows/upload-release-to-plugin-repo.yml

@@ -79,8 +79,14 @@ jobs:
             - name: Commit the Changelog update
               run: |
                   git add changelog.txt
-                  git commit -m "Update Changelog for ${TAG#v}"
-                  git push --set-upstream origin "${{ matrix.branch }}"
+                  # Remove files that are not meant to be commited
+                  # ie. release_notes.txt created on the previous step.
+                  git clean -fd
+                  # Only attempt to commit changelog if it has been modified.
+                  if ! git diff-index --quiet HEAD --; then
+                    git commit -m "Update Changelog for ${TAG#v}"
+                    git push --set-upstream origin "${{ matrix.branch }}"
+                  fi
 
             - name: Upload Changelog artifact
               uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2

.vscode/launch-example.json

@@ -9,6 +9,23 @@
 			"pathMappings": {
 				"/var/www/html/wp-content/plugins/gutenberg": "${workspaceRoot}/"
 			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Debug current e2e test",
+			"program": "${workspaceRoot}/node_modules/@wordpress/scripts/bin/wp-scripts.js",
+			"args": [
+				"test-e2e",
+				"--config=${workspaceRoot}/packages/e2e-tests/jest.config.js",
+				"--verbose=true",
+				"--runInBand",
+				"--watch",
+				"${file}"
+			],
+			"console": "integratedTerminal",
+			"internalConsoleOptions": "neverOpen",
+			"trace": "all"
 		}
 	]
-}
+}

bin/packages/build.js

@@ -263,7 +263,8 @@ stream
 				console.error( error );
 			}
 
-			if ( ended && ++complete === files.length ) {
+			++complete;
+			if ( ended && complete === files.length ) {
 				workerFarm.end( worker );
 			}
 		} )

bin/plugin/commands/changelog.js

@@ -780,7 +780,9 @@ async function createChangelog( settings ) {
 	try {
 		changelog = await getChangelog( settings );
 	} catch ( error ) {
-		changelog = formats.error( error.stack );
+		if ( error instanceof Error ) {
+			changelog = formats.error( error.stack );
+		}
 	}
 
 	log( changelog );