merge trunk into feature branch

Author: chad1008

.eslintrc.js

@@ -110,6 +110,7 @@ const restrictedImports = [
 			'maxBy',
 			'memoize',
 			'merge',
+			'mergeWith',
 			'negate',
 			'noop',
 			'nth',

.github/CODEOWNERS

@@ -78,7 +78,7 @@
 /packages/prettier-config                       @ntwb @gziolo
 /packages/scripts                               @gziolo @ntwb @nerrad @ajitbohra @ryanwelcher
 /packages/stylelint-config                      @ntwb
-/test/e2e                                       @kevin940726
+/test/e2e                                       @kevin940726 @Mamaduka
 
 # UI Components
 /packages/components                            @ajitbohra

.github/workflows/performance.yml

@@ -59,13 +59,13 @@ jobs:
             - name: Compare performance with base branch
               if: github.event_name == 'push'
               # The base hash used here need to be a commit that is compatible with the current WP version
-              # The current one is 843a3053aca918bb10b939be28e676f8e71b751b and it needs to be updated every WP major release.
+              # The current one is 34af5829ac9edb31833167ff6a3b51bea982999c and it needs to be updated every WP major release.
               # It is used as a base comparison point to avoid fluctuation in the performance metrics.
               run: |
                   WP_VERSION=$(awk -F ': ' '/^Tested up to/{print $2}' readme.txt)
                   IFS=. read -ra WP_VERSION_ARRAY <<< "$WP_VERSION"
                   WP_MAJOR="${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
-                  ./bin/plugin/cli.js perf $GITHUB_SHA 843a3053aca918bb10b939be28e676f8e71b751b --tests-branch $GITHUB_SHA --wp-version "$WP_MAJOR"
+                  ./bin/plugin/cli.js perf $GITHUB_SHA 34af5829ac9edb31833167ff6a3b51bea982999c --tests-branch $GITHUB_SHA --wp-version "$WP_MAJOR"
 
             - name: Compare performance with custom branches
               if: github.event_name == 'workflow_dispatch'
@@ -88,7 +88,7 @@ jobs:
                   CODEHEALTH_PROJECT_TOKEN: ${{ secrets.CODEHEALTH_PROJECT_TOKEN }}
               run: |
                   COMMITTED_AT=$(git show -s $GITHUB_SHA --format="%ct")
-                  ./bin/log-performance-results.js $CODEHEALTH_PROJECT_TOKEN trunk $GITHUB_SHA 843a3053aca918bb10b939be28e676f8e71b751b $COMMITTED_AT
+                  ./bin/log-performance-results.js $CODEHEALTH_PROJECT_TOKEN trunk $GITHUB_SHA 34af5829ac9edb31833167ff6a3b51bea982999c $COMMITTED_AT
 
             - name: Archive debug artifacts (screenshots, HTML snapshots)
               uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2

.wp-env.json

@@ -8,7 +8,9 @@
 				"wp-content/plugins/gutenberg": ".",
 				"wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins",
 				"wp-content/plugins/gutenberg-test-plugins": "./packages/e2e-tests/plugins",
-				"wp-content/themes/gutenberg-test-themes": "./test/gutenberg-test-themes"
+				"wp-content/themes/gutenberg-test-themes": "./test/gutenberg-test-themes",
+				"wp-content/themes/gutenberg-test-themes/twentytwentyone": "https://downloads.wordpress.org/theme/twentytwentyone.1.7.zip",
+				"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip"
 			}
 		}
 	}

bin/packages/lint-staged-typecheck.js

@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-const _ = require( 'lodash' );
 const path = require( 'path' );
 const fs = require( 'fs' );
 const execa = require( 'execa' );
@@ -18,12 +17,14 @@ const tscPath = path.join( repoRoot, 'node_modules', '.bin', 'tsc' );
 const changedFiles = process.argv.slice( 2 );
 
 // Transform changed files to package directories containing tsconfig.json.
-const changedPackages = _.uniq(
-	changedFiles.map( ( fullPath ) => {
-		const relativePath = path.relative( repoRoot, fullPath );
-		return path.join( ...relativePath.split( path.sep ).slice( 0, 2 ) );
-	} )
-).filter( ( packageRoot ) =>
+const changedPackages = [
+	...new Set(
+		changedFiles.map( ( fullPath ) => {
+			const relativePath = path.relative( repoRoot, fullPath );
+			return path.join( ...relativePath.split( path.sep ).slice( 0, 2 ) );
+		} )
+	),
+].filter( ( packageRoot ) =>
 	fs.existsSync( path.join( packageRoot, 'tsconfig.json' ) )
 );
 

bin/plugin/commands/performance.js

@@ -337,8 +337,6 @@ async function runPerformanceTests( branches, options ) {
 							performanceTestDirectory,
 							'test/emptytheme'
 						),
-						'https://downloads.wordpress.org/theme/twentytwentyone.1.7.zip',
-						'https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip',
 					],
 					env: {
 						tests: {
@@ -352,6 +350,15 @@ async function runPerformanceTests( branches, options ) {
 										performanceTestDirectory,
 										'packages/e2e-tests/plugins'
 									),
+								'wp-content/themes/gutenberg-test-themes':
+									path.join(
+										performanceTestDirectory,
+										'test/gutenberg-test-themes'
+									),
+								'wp-content/themes/gutenberg-test-themes/twentytwentyone':
+									'https://downloads.wordpress.org/theme/twentytwentyone.1.7.zip',
+								'wp-content/themes/gutenberg-test-themes/twentytwentythree':
+									'https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip',
 							},
 						},
 					},

changelog.txt

@@ -1,98 +1,9 @@
 == Changelog ==
 
-= 16.0.0-rc.4 =
-
-
-
-## Changelog
-
-### Various
-
-- Post title: Fix autofocus when iframed. ([51367](https://github.com/WordPress/gutenberg/pull/51367))
-
-
-
-
-## Contributors
-
-The following contributors merged PRs in this release:
-
-@ellatrix
-
-
-= 16.0.0-rc.3 =
-
-
-
-## Changelog
-
-### Bug Fixes
-
-#### Block Library
-- Post Template: Output number of columns as classname for backwards compatibility. ([51358](https://github.com/WordPress/gutenberg/pull/51358))
-- Query: Fix deprecation error when migrating layout. ([51311](https://github.com/WordPress/gutenberg/pull/51311))
-
-#### Global Styles
-- Global styles revisions: Ensure redirect runs once for back button. ([51316](https://github.com/WordPress/gutenberg/pull/51316))
-
-### Code Quality
-
-#### Site Editor
-- Rename 'page content lock' to 'page content focus'. ([51280](https://github.com/WordPress/gutenberg/pull/51280))
-
-
-## Contributors
-
-The following contributors merged PRs in this release:
-
-@andrewserong @noisysocks @ramonjd
-
-
-= 16.0.0-rc.2 =
-
-
-
-## Changelog
-
-### Bug Fixes
-
-#### Global Styles
-- Global styles revisions: Ensure redirect runs once for back button. ([51316](https://github.com/WordPress/gutenberg/pull/51316))
-
-#### Block Library
-- Query: Fix deprecation error when migrating layout. ([51311](https://github.com/WordPress/gutenberg/pull/51311))
-
-
-### Code Quality
-
-#### Site Editor
-- Rename 'page content lock' to 'page content focus'. ([51280](https://github.com/WordPress/gutenberg/pull/51280))
-
-
-### Various
-
-- Post title: Fix autofocus when iframed. ([51331](https://github.com/WordPress/gutenberg/pull/51331))
-
-
-
-
-## Contributors
-
-The following contributors merged PRs in this release:
-
-@andrewserong @ellatrix @noisysocks @ramonjd
-
-
-= 16.0.0-rc.1 =
+= 16.0.0 =
 
 ## Changelog
 
-### Features
-
-- Add the ability to create a new page in the Site Editor. ([50565](https://github.com/WordPress/gutenberg/pull/50565))
-- Add the ability to focus on editing a page's content vs the page's template. ([50857](https://github.com/WordPress/gutenberg/pull/50857))
-- Add page details to the Site Editor sidebar. ([50767](https://github.com/WordPress/gutenberg/pull/50767))
-
 ### Enhancements
 
 #### Block Editor
@@ -104,15 +15,18 @@ The following contributors merged PRs in this release:
 - List View: Allow dragging outside the immediate area by passing down a dropZoneElement. ([50726](https://github.com/WordPress/gutenberg/pull/50726))
 - List View: Append when dragging into collapsed blocks. ([50936](https://github.com/WordPress/gutenberg/pull/50936))
 - Reinstate Text control outside of settings in Link Control. ([50957](https://github.com/WordPress/gutenberg/pull/50957))
+- Update the document title in the template mode of the post editor. ([50864](https://github.com/WordPress/gutenberg/pull/50864))
 - Use "Save" instead of "Apply" in Link Control. ([50964](https://github.com/WordPress/gutenberg/pull/50964))
 - Use checkbox for `Open in new tab` within Link Control. ([50961](https://github.com/WordPress/gutenberg/pull/50961))
 - Visually hide the LinkControl initial/results heading. ([50977](https://github.com/WordPress/gutenberg/pull/50977))
-- Update the document title in the template mode of the post editor. ([50864](https://github.com/WordPress/gutenberg/pull/50864))
 
 #### Site Editor
 - Add `delete` action for pages in navigation sidebar. ([51101](https://github.com/WordPress/gutenberg/pull/51101))
+- Add page details to the Site Editor sidebar. ([50767](https://github.com/WordPress/gutenberg/pull/50767))
 - Add Paragraph prompt to Post Content when empty. ([50623](https://github.com/WordPress/gutenberg/pull/50623))
 - Add template actions in site editor navigation sidebar. ([51054](https://github.com/WordPress/gutenberg/pull/51054))
+- Add the ability to create a new page in the Site Editor. ([50565](https://github.com/WordPress/gutenberg/pull/50565))
+- Add the ability to focus on editing a page's content vs the page's template. ([50857](https://github.com/WordPress/gutenberg/pull/50857))
 - Directly save if only changing current context. ([50567](https://github.com/WordPress/gutenberg/pull/50567))
 - Disable block supports derived design tools when Blocking Editing Mode is not `default`. ([50912](https://github.com/WordPress/gutenberg/pull/50912))
 - DocumentActions: Animate between page and template mode. ([51224](https://github.com/WordPress/gutenberg/pull/51224))
@@ -160,11 +74,12 @@ The following contributors merged PRs in this release:
 #### Block Editor
 - Add inert attribute to disabled blocks that have only disabled descendants. ([51079](https://github.com/WordPress/gutenberg/pull/51079))
 - Fix multi-entity multi-property undo redo. ([50911](https://github.com/WordPress/gutenberg/pull/50911))
+- Hide the save draft button for published posts. ([51193](https://github.com/WordPress/gutenberg/pull/51193))
 - Iframe enqueuing: Add editorStyle and warning. ([50091](https://github.com/WordPress/gutenberg/pull/50091))
 - Improvements to how blocks with a 'disabled' editing mode behave. ([51148](https://github.com/WordPress/gutenberg/pull/51148))
 - Link Control: Add missing translation. ([51081](https://github.com/WordPress/gutenberg/pull/51081))
+- Make sure post content always has correct layout. ([51431](https://github.com/WordPress/gutenberg/pull/51431))
 - Navigation: Memoize link value passed to the LinkControl. ([51155](https://github.com/WordPress/gutenberg/pull/51155))
-- Hide the save draft button for published posts. ([51193](https://github.com/WordPress/gutenberg/pull/51193))
 
 #### Site Editor
 - Browse Mode: Remove horizontal scrollbar during screen transitions. ([51189](https://github.com/WordPress/gutenberg/pull/51189))
@@ -179,11 +94,15 @@ The following contributors merged PRs in this release:
 - Freeform/Shortcode: Prevent blocks from converting HTML entities. ([51123](https://github.com/WordPress/gutenberg/pull/51123))
 - Navigation: Apply color classes to the navigation container element. ([50968](https://github.com/WordPress/gutenberg/pull/50968))
 - Post Template: Set block context via filter. ([50313](https://github.com/WordPress/gutenberg/pull/50313))
+- Post Template: Output number of columns as classname for backwards compatibility. ([51358](https://github.com/WordPress/gutenberg/pull/51358))
+- Post Title: Fix autofocus when iframed. ([51331](https://github.com/WordPress/gutenberg/pull/51331), [51367](https://github.com/WordPress/gutenberg/pull/51367))
+- Query: Fix deprecation error when migrating layout. ([51311](https://github.com/WordPress/gutenberg/pull/51311))
 - Term Description: Handle default margin styles. ([51137](https://github.com/WordPress/gutenberg/pull/51137))
 
 #### Global Styles
 - DimensionsPanel: Fix site editor error on Columns block level screen. ([51252](https://github.com/WordPress/gutenberg/pull/51252))
 - Fluid typography: Ensure max viewport width is used in the editor. ([51146](https://github.com/WordPress/gutenberg/pull/51146))
+- Global styles revisions: Ensure redirect runs once for back button. ([51316](https://github.com/WordPress/gutenberg/pull/51316))
 - SpacingSizesControl: Fix problem with the slider position being reset when saving global styles. ([50956](https://github.com/WordPress/gutenberg/pull/50956))
 - Styles Screen: Ensure variations previews will render in mobile viewports. ([51080](https://github.com/WordPress/gutenberg/pull/51080))
 
@@ -199,6 +118,7 @@ The following contributors merged PRs in this release:
 
 #### Accessibility
 - Add aria labels to the focal point picker component. ([50993](https://github.com/WordPress/gutenberg/pull/50993))
+- Block Toolbar: Fix text only label for locked blocks. ([50944](https://github.com/WordPress/gutenberg/pull/50944))
 - Fix Navigable Toolbar initialIndex. ([51181](https://github.com/WordPress/gutenberg/pull/51181))
 - Fix screen readers not announcing updated `aria-describedby` in Firefox. ([51035](https://github.com/WordPress/gutenberg/pull/51035))
 - Link Control: Fix the 'Save' button's disabled state. ([51117](https://github.com/WordPress/gutenberg/pull/51117))
@@ -261,6 +181,7 @@ The following contributors merged PRs in this release:
 - Remove legacy logic for `__unstableResolvedAssets`. ([51100](https://github.com/WordPress/gutenberg/pull/51100))
 - Remove outdated Babel spread optimization from selectors. ([50987](https://github.com/WordPress/gutenberg/pull/50987))
 - Remove the insert.ref field from insertUsage data. ([51130](https://github.com/WordPress/gutenberg/pull/51130))
+- Rename 'page content lock' to 'page content focus'. ([51280](https://github.com/WordPress/gutenberg/pull/51280))
 - Separate template screens in the Site Editor. ([51040](https://github.com/WordPress/gutenberg/pull/51040))
 - Writing flow: Fix tab into iframe. ([50955](https://github.com/WordPress/gutenberg/pull/50955))
 

docs/contributors/code/react-native/integration-test-guide.md

@@ -121,42 +121,32 @@ const radiusSlider = getByTestId( 'Slider Border Radius' );
 
 Note that either a plain string or a regular expression can be passed into these queries. A regular expression is best for querying part of a string (e.g. any element whose accessibility label contains `Unsupported Block. Row 1`). Note that special characters such as `.` need to be escaped.
 
-### Use of `waitFor`
+### Use of `find` queries
 
-After rendering the components or firing an event, side effects might happen due to potential state updates so the element we’re looking for might not be yet rendered. In this case, we would need to wait for the element to be available and for this purpose, we can use the `waitFor` function, which periodically executes the provided callback to determine whether the element appeared or not.
+After rendering the components or firing an event, side effects might happen due to potential state updates so the element we’re looking for might not be yet rendered. In this case, we would need to wait for the element to be available and for this purpose, we can use the `find*` versions of query functions, which internally use `waitFor` and periodically check whether the element appeared or not.
 
 Here are some examples:
 
 ```js
-const mediaLibraryButton = await waitFor( () =>
-	getByText( 'WordPress Media Library' )
-);
+const mediaLibraryButton = await findByText( 'WordPress Media Library' );
 ```
 
 ```js
-const missingBlock = await waitFor( () =>
-	getByLabelText( /Unsupported Block\. Row 1/ )
-);
+const missingBlock = await findByLabelText( /Unsupported Block\. Row 1/ );
 ```
 
 ```js
-const radiusSlider = await waitFor( () =>
-	getByTestId( 'Slider Border Radius' )
-);
+const radiusSlider = await findByTestId( 'Slider Border Radius' );
 ```
 
-In most cases we’ll use the `waitFor` function, but it’s important to note that it should be restricted to those queries that actually require waiting for the element to be available.
-
-NOTE: The `react-native-testing-library` package provides the `query*` and `find*` functions for this purpose too, but we should avoid using them for now because there’s a [known issue](https://github.com/callstack/react-native-testing-library/issues/379) that would make the test fail.
+In most cases we’ll use the `find*` functions, but it’s important to note that it should be restricted to those queries that actually require waiting for the element to be available.
 
 ### `within` queries
 
 It’s also possible to query elements contained in other elements via the `within` function, here is an example:
 
 ```js
-const missingBlock = await waitFor( () =>
-	getByLabelText( /Unsupported Block\. Row 1/ )
-);
+const missingBlock = await findByLabelText( /Unsupported Block\. Row 1/ );
 const translatedTableTitle = within( missingBlock ).getByText( 'Tabla' );
 ```
 
@@ -236,7 +226,7 @@ Here is an example of how to insert a Paragraph block:
 
 ```js
 // Open the inserter menu
-fireEvent.press( await waitFor( () => getByLabelText( 'Add block' ) ) );
+fireEvent.press( await findByLabelText( 'Add block' ) );
 
 const blockList = getByTestId( 'InserterUI-Blocks' );
 // onScroll event used to force the FlatList to render all items
@@ -249,7 +239,7 @@ fireEvent.scroll( blockList, {
 } );
 
 // Insert a Paragraph block
-fireEvent.press( await waitFor( () => getByText( `Paragraph` ) ) );
+fireEvent.press( await findByText( `Paragraph` ) );
 ```
 
 ### Open block settings
@@ -259,7 +249,7 @@ The block settings can be accessed by tapping the "Open Settings" button after s
 ```js
 fireEvent.press( block );
 
-const settingsButton = await waitFor( () => getByLabelText( 'Open Settings' ) );
+const settingsButton = await findByLabelText( 'Open Settings' );
 fireEvent.press( settingsButton );
 ```
 
@@ -301,9 +291,7 @@ fireEvent.scroll( blockList, {
 Sliders found in bottom sheets should be queried using their `testID`:
 
 ```js
-const radiusSlider = await waitFor( () =>
-	getByTestId( 'Slider Border Radius' )
-);
+const radiusSlider = await findByTestId( 'Slider Border Radius' );
 fireEvent( radiusSlider, 'valueChange', '30' );
 ```
 
@@ -314,8 +302,8 @@ Note that a slider’s `testID` is "Slider " + label. So for a slider with a lab
 One caveat when adding blocks is that if they contain inner blocks, these inner blocks are not rendered. The following example shows how we can make a Buttons block render its inner Button blocks (assumes we’ve already obtained a reference to the Buttons block as `buttonsBlock`):
 
 ```js
-const innerBlockListWrapper = await waitFor( () =>
-	within( buttonsBlock ).getByTestId( 'block-list-wrapper' )
+const innerBlockListWrapper = await within( buttonsBlock ).findByTestId(
+	'block-list-wrapper'
 );
 fireEvent( innerBlockListWrapper, 'layout', {
 	nativeEvent: {
@@ -325,8 +313,8 @@ fireEvent( innerBlockListWrapper, 'layout', {
 	},
 } );
 
-const buttonInnerBlock = await waitFor( () =>
-	within( buttonsBlock ).getByLabelText( /Button Block\. Row 1/ )
+const buttonInnerBlock = await within( buttonsBlock ).findByLabelText(
+	/Button Block\. Row 1/
 );
 fireEvent.press( buttonInnerBlock );
 ```