Merge branch 'trunk' into add/defer-script-loading-strategy

* trunk: (36 commits) Use `_get_block_template_file` function and set $area variable. (#52708) Change Delete page menu item to Move to trash. (#52641) Search block: Enqueue view script through block.json (#52552) Patterns: fix bug with Create Patterns menu not showing in site editor page editing (#52671) Github workflow: add a PHP backport changes action (#52096) Add layout API documentation. (#52673) Show uncategorized patterns on the Editor > Patterns page (#52633) Patterns: Remove `reusable` text from menu once rename hint has been dismissed (#52664) Update locked pattern tooltips (#52497) Rich Text/Footnotes: fix getRichTextValues for useInnerBlocksProps.save (#52682) Use posts instead of template parts for navigation color tests (#52654) Site Editor: Don't allow creating template part on the Patterns page for non-block themes (#52656) Site Editor: Fix incorrect 'useSelect' usage (#52683) Update issue gardening automation with new label (#52173) i18n: Make the tab labels of `ColorGradientSettingsDropdown` component translatable (#52669) Post Content link color should not be applied to placeholder component links (#52367) [Mobile] Update toolbar icons and colors (#52336) Avoid copying global style presets via the styles compatibility hook (#52640) Show warning on removal of Post Template block in the site editor. (#52666) Backport tools: sort PRs to be cherry picked by merged/closed date (#52667) ...
WordPress · Jul 18, 2023 · 7fe5534 · 7fe5534
2 parents 4a7fc46 + 211713c
commit 7fe5534
Show file tree

Hide file tree

Showing 113 changed files with 1,374 additions and 545 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -44,125 +44,7 @@ const restrictedImports = [
 	},
 	{
 		name: 'lodash',
-		importNames: [
-			'camelCase',
-			'capitalize',
-			'castArray',
-			'chunk',
-			'clamp',
-			'clone',
-			'cloneDeep',
-			'compact',
-			'concat',
-			'countBy',
-			'debounce',
-			'deburr',
-			'defaults',
-			'defaultTo',
-			'delay',
-			'difference',
-			'differenceWith',
-			'dropRight',
-			'each',
-			'escape',
-			'escapeRegExp',
-			'every',
-			'extend',
-			'filter',
-			'find',
-			'findIndex',
-			'findKey',
-			'findLast',
-			'first',
-			'flatMap',
-			'flatten',
-			'flattenDeep',
-			'flow',
-			'flowRight',
-			'forEach',
-			'fromPairs',
-			'get',
-			'groupBy',
-			'has',
-			'identity',
-			'includes',
-			'invoke',
-			'isArray',
-			'isBoolean',
-			'isEmpty',
-			'isEqual',
-			'isFinite',
-			'isFunction',
-			'isMatch',
-			'isNil',
-			'isNumber',
-			'isObject',
-			'isObjectLike',
-			'isPlainObject',
-			'isString',
-			'isUndefined',
-			'kebabCase',
-			'keyBy',
-			'keys',
-			'last',
-			'lowerCase',
-			'map',
-			'mapKeys',
-			'mapValues',
-			'maxBy',
-			'memoize',
-			'merge',
-			'mergeWith',
-			'negate',
-			'noop',
-			'nth',
-			'omit',
-			'omitBy',
-			'once',
-			'orderby',
-			'overEvery',
-			'partial',
-			'partialRight',
-			'pick',
-			'pickBy',
-			'random',
-			'reduce',
-			'reject',
-			'repeat',
-			'reverse',
-			'set',
-			'setWith',
-			'size',
-			'snakeCase',
-			'some',
-			'sortBy',
-			'startCase',
-			'startsWith',
-			'stubFalse',
-			'stubTrue',
-			'sum',
-			'sumBy',
-			'take',
-			'throttle',
-			'times',
-			'toString',
-			'trim',
-			'truncate',
-			'unescape',
-			'unionBy',
-			'uniq',
-			'uniqBy',
-			'uniqueId',
-			'uniqWith',
-			'upperFirst',
-			'values',
-			'without',
-			'words',
-			'xor',
-			'zip',
-		],
-		message:
-			'This Lodash method is not recommended. Please use native functionality instead. If using `memoize`, please use `memize` instead.',
+		message: 'Please use native functionality instead.',
 	},
 	{
 		name: 'reakit',

diff --git a/.github/workflows/php-changes-detection.yml b/.github/workflows/php-changes-detection.yml
@@ -0,0 +1,100 @@
+name: OPTIONAL - Confirm if PHP changes require backporting to WordPress Core
+
+on:
+    pull_request:
+        types: [opened, synchronize]
+jobs:
+    detect_php_changes:
+        name: Detect PHP changes
+        runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
+        steps:
+            - name: Check out code
+              uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+              with:
+                  fetch-depth: 0
+
+            - name: Get changed PHP files
+              id: changed-files-php
+              uses: tj-actions/changed-files@v37
+              with:
+                  files: |
+                      *.{php}
+                      lib/**
+                      phpunit/**
+
+            - name: List all changed files
+              if: steps.changed-files-php.outputs.any_changed == 'true'
+              id: list-changed-php-files
+              run: |
+                  echo "Changed files:"
+                  formatted_change_list=""
+                  for file in ${{ steps.changed-files-php.outputs.all_changed_files }}; do
+                    echo "$file was changed"
+                    formatted_change_list+="<br>:grey_question: $file"
+                  done
+                  formatted_change_list+="<br>"
+                  echo "formatted_change_list=$formatted_change_list" >> $GITHUB_OUTPUT
+
+            - name: Find Comment
+              uses: peter-evans/find-comment@v2
+              id: find-comment
+              with:
+                  issue-number: ${{ github.event.pull_request.number }}
+                  comment-author: 'github-actions[bot]'
+                  body-includes: '<!-- pr-contains-php-changes -->'
+
+            - name: Create comment
+              if: steps.find-comment.outputs.comment-id == '' && steps.changed-files-php.outputs.any_changed == 'true'
+              uses: peter-evans/create-or-update-comment@v3
+              with:
+                  issue-number: ${{ github.event.pull_request.number }}
+                  body: |
+                      <!-- pr-contains-php-changes -->
+                      This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.
+
+                      If so, it is recommended to create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core Github repository](https://github.com/WordPress/wordpress-develop) soon after this pull request is merged.
+
+                      If you're unsure, you can always ask for help in the #core-editor channel in  [WordPress Slack](https://make.wordpress.org/chat/).
+
+                      Thank you! :heart:
+
+                      <details>
+                        <summary>View changed files</summary>
+                        ${{ steps.list-changed-php-files.outputs.formatted_change_list }}
+                      </details>
+
+            - name: Update comment
+              if: steps.find-comment.outputs.comment-id != '' && steps.changed-files-php.outputs.any_changed == 'true'
+              uses: peter-evans/create-or-update-comment@v3
+              with:
+                  comment-id: ${{ steps.find-comment.outputs.comment-id }}
+                  issue-number: ${{ github.event.pull_request.number }}
+                  edit-mode: replace
+                  body: |
+                      <!-- pr-contains-php-changes -->
+                      This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.
+
+                      If so, it is recommended to create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core Github repository](https://github.com/WordPress/wordpress-develop) soon after this pull request is merged.
+
+                      If you're unsure, you can always ask for help in the #core-editor channel in  [WordPress Slack](https://make.wordpress.org/chat/).
+
+                      Thank you! :heart:
+
+                      <details>
+                        <summary>View changed files</summary>
+                        ${{ steps.list-changed-php-files.outputs.formatted_change_list }}
+                      </details>
+
+            - name: Update comment
+              if: steps.find-comment.outputs.comment-id != '' && steps.changed-files-php.outputs.any_changed != 'true'
+              uses: peter-evans/create-or-update-comment@v3
+              with:
+                  comment-id: ${{ steps.find-comment.outputs.comment-id }}
+                  issue-number: ${{ github.event.pull_request.number }}
+                  edit-mode: replace
+                  body: |
+                      <!-- pr-contains-php-changes -->
+                      This pull request changed or added PHP files in previous commits, but none have been detected in the latest commit.
+
+                      Thank you! :heart:
diff --git a/.github/workflows/stale-issue-gardening.yml b/.github/workflows/stale-issue-gardening.yml
@@ -38,7 +38,7 @@ jobs:
                       days-before-stale: 180
                       days-before-close: -1
                       remove-stale-when-updated: false
-                      stale-issue-label: 'Needs Testing'
+                      stale-issue-label: 'Needs check-in'
 
         steps:
             - name: Update issues

diff --git a/bin/cherry-pick.mjs b/bin/cherry-pick.mjs
@@ -114,12 +114,25 @@ async function fetchPRs() {
 	const { items } = await GitHubFetch(
 		`/search/issues?q=is:pr state:closed sort:updated label:"${ LABEL }" repo:WordPress/gutenberg`
 	);
-	const PRs = items.map( ( { id, number, title } ) => ( {
+	const PRs = items.map( ( { id, number, title, pull_request, closed_at } ) => ( {
 		id,
 		number,
 		title,
-	} ) );
-	console.log( 'Found the following PRs to cherry-pick: ' );
+		closed_at,
+		pull_request,
+	} ) ).sort( ( a, b ) => {
+		/*
+		 * `closed_at` and `pull_request.merged_at` are _usually_ the same,
+		 * but let's prefer the latter if it's available.
+		 */
+		if ( a?.pull_request?.merged_at && b?.pull_request?.merged_at ) {
+			return new Date(  a?.pull_request?.merged_at ) - new Date( b?.pull_request?.merged_at );
+		}
+		return new Date( a.closed_at ) - new Date( b.closed_at );
+	} );
+
+
+	console.log( 'Found the following PRs to cherry-pick (sorted by closed date in ascending order): ' );
 	PRs.forEach( ( { number, title } ) =>
 		console.log( indent( `#${ number } – ${ title }` ) )
 	);

diff --git a/bin/test-create-block.sh b/bin/test-create-block.sh
@@ -55,7 +55,7 @@ if [ "$expected" -ne "$actual" ]; then
 	error "Expected $expected files in the project root, but found $actual."
     exit 1
 fi
-expected=6
+expected=7
 actual=$( find src -maxdepth 1 -type f | wc -l )
 if [ "$expected" -ne "$actual" ]; then
 	error "Expected $expected files in the \`src\` directory, but found $actual."
@@ -69,7 +69,7 @@ status "Building block..."
 ../node_modules/.bin/wp-scripts build
 
 status "Verifying build..."
-expected=5
+expected=7
 actual=$( find build -maxdepth 1 -type f | wc -l )
 if [ "$expected" -ne "$actual" ]; then
 	error "Expected $expected files in the \`build\` directory, but found $actual."

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1505,6 +1505,12 @@
 		"markdown_source": "../packages/core-data/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/create-block-interactive-template",
+		"slug": "packages-create-block-interactive-template",
+		"markdown_source": "../packages/create-block-interactive-template/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/create-block-tutorial-template",
 		"slug": "packages-create-block-tutorial-template",

diff --git a/docs/reference-guides/block-api/block-supports.md b/docs/reference-guides/block-api/block-supports.md
@@ -543,6 +543,79 @@ supports: {
 }
 ```
 
+## layout
+
+-   Type: `boolean` or `Object`
+-   Default value: null
+-   Subproperties:
+    -   `default`: type `Object`, default value null
+    -   `allowSwitching`: type `boolean`, default value `false`
+    -   `allowEditing`: type `boolean`, default value `true`
+    -   `allowInheriting`: type `boolean`, default value `true`
+    -   `allowSizingOnChildren`: type `boolean`, default value `false`
+    -   `allowVerticalAlignment`: type `boolean`, default value `true`
+    -   `allowJustification`: type `boolean`, default value `true`
+    -   `allowOrientation`: type `boolean`, default value `true`
+
+This value only applies to blocks that are containers for inner blocks. If set to `true` the layout type will be `flow`. For other layout types it's necessary to set the `type` explicitly inside the `default` object.
+
+### layout.default
+
+-   Type: `Object`
+-   Default value: null
+
+Allows setting the `type` property to define what layout type is default for the block, and also default values for any properties inherent to that layout type, e.g., for a `flex` layout, a default value can be set for `flexWrap`.
+
+### layout.allowSwitching
+
+-   Type: `boolean`
+-   Default value: `false`
+
+Exposes a switcher control that allows toggling between all existing layout types.
+
+### layout.allowEditing
+
+-   Type: `boolean`
+-   Default value: `true`
+
+Determines display of layout controls in the block sidebar. If set to false, layout controls will be hidden.
+
+### layout.allowInheriting
+
+-   Type: `boolean`
+-   Default value: `true`
+
+For the `flow` layout type only, determines display of the "Inner blocks use content width" toggle.
+
+### layout.allowSizingOnChildren
+
+-   Type: `boolean`
+-   Default value: `false`
+
+For the `flex` layout type only, determines display of sizing controls (Fit/Fill/Fixed) on all child blocks of the flex block.
+
+### layout.allowVerticalAlignment
+
+-   Type: `boolean`
+-   Default value: `true`
+
+For the `flex` layout type only, determines display of the vertical alignment control in the block toolbar.
+
+### layout.allowJustification
+
+-   Type: `boolean`
+-   Default value: `true`
+
+For the `flex` layout type, determines display of the justification control in the block toolbar and block sidebar. For the `constrained` layout type, determines display of justification control in the block sidebar.
+
+### layout.allowOrientation
+
+-   Type: `boolean`
+-   Default value: `true`
+
+For the `flex` layout type only, determines display of the orientation control in the block toolbar.
+
+
 ## multiple
 
 -   Type: `boolean`