Merge branch 'trunk' into redo-footnote-revisioning

.eslintrc.js

@@ -51,6 +51,11 @@ const restrictedImports = [
 		message:
 			'Please use Reakit API through `@wordpress/components` instead.',
 	},
+	{
+		name: '@ariakit/react',
+		message:
+			'Please use Ariakit API through `@wordpress/components` instead.',
+	},
 	{
 		name: 'redux',
 		importNames: [ 'combineReducers' ],

.git-blame-ignore-revs

@@ -6,3 +6,9 @@ f63053cace3c02e284f00918e1854284c85b9132
 
 # Prettier upgrade to 2.6.2.
 33d84b036592a5bf31af05b7710f3b2b14163dc4
+
+# Prettier upgrade to 2.8.5.
+c56e8a1910ed74f405b74bbb12fe81dea974e5c3
+
+# Prettier upgrade to 3.0.3.
+0bee15148fe4330c20cf372cb46a33693e45cb5f

.github/CODEOWNERS

@@ -22,6 +22,7 @@
 /packages/block-library/src/comment-template    @michalczaplinski
 /packages/block-library/src/comments            @michalczaplinski
 /packages/block-library/src/table-of-contents   @ZebulanStanphill
+/packages/block-library/src/image								@artemiomorales @michalczaplinski
 
 # Duotone
 /lib/block-supports/duotone.php                       @ajlende
@@ -135,6 +136,7 @@
 
 # PHP
 /lib                                            @spacedmonkey
+/lib/compat/*/html-api                          @dmsnell
 /lib/experimental/rest-api.php                  @timothybjacobs
 /lib/experimental/class-wp-rest-*               @timothybjacobs
 /lib/experimental/class-wp-rest-block-editor-settings-controller.php @timothybjacobs @spacedmonkey @geriux

.github/workflows/php-changes-detection.yml

@@ -17,7 +17,7 @@ jobs:
 
             - name: Get changed PHP files
               id: changed-files-php
-              uses: tj-actions/changed-files@48566bbcc22ceb7c5809ebdd27377309f2c3de8c # v39
+              uses: tj-actions/changed-files@41960309398d165631f08c5df47a11147e14712b # v39.1.2
               with:
                   files: |
                       *.{php}

.github/workflows/pull-request-automation.yml

@@ -26,7 +26,7 @@ jobs:
                   node-version: ${{ matrix.node }}
 
             - name: Cache NPM packages
-              uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
               with:
                   # npm cache files are stored in `~/.npm` on Linux/macOS
                   path: ~/.npm

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

@@ -28,7 +28,7 @@ jobs:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Use desired version of Java
-              uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+              uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
               with:
                   distribution: 'corretto'
                   java-version: '17'
@@ -40,7 +40,7 @@ jobs:
               uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
 
             - name: AVD cache
-              uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
               id: avd-cache
               with:
                   path: |

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

@@ -34,15 +34,15 @@ jobs:
               run: find package-lock.json packages/react-native-editor/ios packages/react-native-aztec/ios packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
 
             - name: Restore build cache
-              uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
               with:
                   path: |
                       packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app
                       packages/react-native-editor/ios/build/WDA
                   key: ${{ runner.os }}-ios-build-${{ matrix.xcode }}-${{ matrix.device }}-${{ hashFiles('ios-checksums.txt') }}
 
             - name: Restore pods cache
-              uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
               with:
                   path: |
                       packages/react-native-editor/ios/Pods

.github/workflows/unit-test.yml

@@ -126,7 +126,7 @@ jobs:
             # dependency versions are installed and cached.
             ##
             - name: Set up PHP
-              uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5
+              uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
               with:
                   php-version: '${{ matrix.php }}'
                   ini-file: development
@@ -226,7 +226,7 @@ jobs:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Set up PHP
-              uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f # v2.25.5
+              uses: shivammathur/setup-php@7fdd3ece872ec7ec4c098ae5ab7637d5e0a96067 # v2.26.0
               with:
                   php-version: '7.4'
                   coverage: none
@@ -239,7 +239,7 @@ jobs:
               run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
 
             - name: Cache PHPCS scan cache
-              uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
               with:
                   path: .cache/phpcs.json
                   key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}

.npmpackagejsonlintrc.json

@@ -29,6 +29,14 @@
 				"require-repository-directory": "off",
 				"prefer-no-devDependencies": "off"
 			}
+		},
+		{
+			"patterns": [ "./platform-docs/package.json" ],
+			"rules": {
+				"require-publishConfig": "off",
+				"require-repository-directory": "off",
+				"prefer-no-devDependencies": "off"
+			}
 		}
 	]
 }

bin/cherry-pick.mjs

@@ -9,7 +9,7 @@ import { spawnSync } from 'node:child_process';
 const LABEL = process.argv[ 2 ] || 'Backport to WP Beta/RC';
 const BRANCH = getCurrentBranch();
 const GITHUB_CLI_AVAILABLE = spawnSync( 'gh', [ 'auth', 'status' ] )
-	?.stderr?.toString()
+	?.stdout?.toString()
 	.includes( '✓ Logged in to github.com as' );
 
 const AUTO_PROPAGATE_RESULTS_TO_GITHUB = GITHUB_CLI_AVAILABLE;

bin/packages/check-build-type-declaration-files.js

@@ -83,7 +83,7 @@ async function checkUnverifiedDeclarationFiles() {
 	const packageDir = path.resolve( 'packages' );
 	const packageDirs = (
 		await fs.readdir( packageDir, { withFileTypes: true } )
-	 )
+	)
 		.filter( ( dirent ) => dirent.isDirectory() )
 		.map( ( dirent ) => path.join( packageDir, dirent.name ) );
 
@@ -97,7 +97,7 @@ async function checkUnverifiedDeclarationFiles() {
 					: null
 			)
 		)
-	 ).filter( Boolean );
+	).filter( Boolean );
 
 	const tscResults = await Promise.allSettled(
 		declarations.map( typecheckDeclarations )

bin/plugin/commands/packages.js

@@ -198,10 +198,9 @@ async function updatePackages( config ) {
 	);
 	const changelogFilesPublicPackages = changelogFiles.filter(
 		( changelogPath ) => {
-			const pkg = require( path.join(
-				path.dirname( changelogPath ),
-				'package.json'
-			) );
+			const pkg = require(
+				path.join( path.dirname( changelogPath ), 'package.json' )
+			);
 			return pkg.private !== true;
 		}
 	);