Merge remote-tracking branch 'upstream/trunk' into trunk

# Conflicts:
#	.github/workflows/check-built-files.yml
#	.github/workflows/reusable-check-built-files.yml

Author: desrosj

.github/workflows/check-built-files.yml

@@ -32,7 +32,7 @@ concurrency:
   # The concurrency group contains the workflow name and the branch name for pull requests
   # or the commit hash for any other events.
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request_target' && github.head_ref || github.sha }}
-
+  cancel-in-progress: true
 
 # Disable permissions for all available scopes by default.
 # Any needed permissions should be configured at the job level.

.github/workflows/end-to-end-tests.yml

@@ -33,7 +33,7 @@ on:
       - 'tests/e2e/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/end-to-end-tests.yml'
-      - '.github/workflows/reusable-end-to-end-tests-*.yml'
+      - '.github/workflows/reusable-end-to-end-tests*.yml'
   workflow_dispatch:
 
 # Cancels all previous workflow runs for pull requests that have not completed.

.github/workflows/reusable-check-built-files.yml

@@ -29,18 +29,33 @@ jobs:
   # - Builds Emoji files.
   # - Builds bundled Root Certificate files.
   # - Builds WordPress.
+<<<<<<< HEAD
   # - Configures the Git author.
   # - Checks for changes to versioned files.
+=======
+  # - Checks for changes to versioned files.
+  # - Displays the result of git diff for debugging purposes.
+  # - Configures the Git author.
+>>>>>>> upstream/trunk
   # - Stages changes.
   # - Commits changes.
   # - Pushes changes.
   update-built-files:
     name: Check and update built files
     runs-on: ubuntu-24.04
+<<<<<<< HEAD
     permissions:
       contents: write
     # This prevents a second run after changes are committed back because Dependabot always rebases updates onto trunk.
     if: ${{ github.actor != 'dependabot[bot]' || github.event.commits < 2 }}
+=======
+    # This prevents an unnecessary second run after changes are committed back because Dependabot always rebases
+    # updates and force pushes.
+    if: ${{ github.actor != 'dependabot[bot]' || github.event.commits < 2 }}
+    timeout-minutes: 10
+    permissions:
+      contents: write
+>>>>>>> upstream/trunk
     steps:
       - name: Generate Installation Token
         id: generate_token
@@ -56,7 +71,11 @@ jobs:
           private_key = open("private-key.pem", "r").read()
           payload = {
               "iat": int(time.time()),
+<<<<<<< HEAD
               "exp": int(time.time()) + 60,  # 1-minute expiration
+=======
+              "exp": int(time.time()) + 600,  # 10-minute expiration
+>>>>>>> upstream/trunk
               "iss": $GH_APP_ID
           }
           print(jwt.encode(payload, private_key, algorithm="RS256"))
@@ -127,11 +146,6 @@ jobs:
       - name: Build WordPress
         run: npm run build:dev
 
-      - name: Configure git user name and email
-        run: |
-          git config user.name "dependabot[bot]"
-          git config user.email 49699333+dependabot[bot]@users.noreply.github.com
-
       - name: Check for changes to versioned files
         id: built-file-check
         run: |
@@ -142,8 +156,15 @@ jobs:
           fi
 
       - name: Display changes to versioned files
+        if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
         run: git diff
 
+      - name: Configure git user name and email
+        if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
+        run: |
+          git config user.name "dependabot[bot]"
+          git config user.email 49699333+dependabot[bot]@users.noreply.github.com
+
       - name: Stage changes
         if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
         run: git add .

.github/workflows/reusable-end-to-end-tests.yml

@@ -28,6 +28,11 @@ on:
         description: 'A specific version of Gutenberg to install.'
         required: false
         type: 'string'
+      install-playwright:
+        description: 'Whether to install Playwright browsers.'
+        required: false
+        type: 'boolean'
+        default: true
 
 env:
   LOCAL_DIR: build
@@ -94,6 +99,7 @@ jobs:
         run: npm ci
 
       - name: Install Playwright browsers
+        if: ${{ inputs.install-playwright }}
         run: npx playwright install --with-deps
 
       - name: Build WordPress

src/js/_enqueues/admin/common.js

@@ -419,12 +419,18 @@ window.columns = {
 	 */
 	saveManageColumnsState : function() {
 		var hidden = this.hidden();
-		$.post(ajaxurl, {
-			action: 'hidden-columns',
-			hidden: hidden,
-			screenoptionnonce: $('#screenoptionnonce').val(),
-			page: pagenow
-		});
+		$.post(
+			ajaxurl,
+			{
+				action: 'hidden-columns',
+				hidden: hidden,
+				screenoptionnonce: $('#screenoptionnonce').val(),
+				page: pagenow
+			},
+			function() {
+				wp.a11y.speak( __( 'Screen Options updated.' ) );
+			}
+		);
 	},
 
 	/**

src/js/_enqueues/admin/postbox.js

@@ -461,13 +461,19 @@
 			closed = $( '.postbox' ).filter( '.closed' ).map( function() { return this.id; } ).get().join( ',' );
 			hidden = $( '.postbox' ).filter( ':hidden' ).map( function() { return this.id; } ).get().join( ',' );
 
-			$.post(ajaxurl, {
-				action: 'closed-postboxes',
-				closed: closed,
-				hidden: hidden,
-				closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
-				page: page
-			});
+			$.post(
+				ajaxurl,
+				{
+					action: 'closed-postboxes',
+					closed: closed,
+					hidden: hidden,
+					closedpostboxesnonce: jQuery('#closedpostboxesnonce').val(),
+					page: page
+				},
+				function() {
+					wp.a11y.speak( __( 'Screen Options updated.' ) );
+				}
+			);
 		},
 
 		/**

src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -116,7 +116,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 				event.content = event.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
 					return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
-						'class="wp-more-tag mce-wp-more" alt="" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />';
+						'class="wp-more-tag mce-wp-more" alt="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />';
 				});
 			}
 
@@ -125,7 +125,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 				event.content = event.content.replace( /<!--nextpage-->/g,
 					'<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
-						'alt="" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
+						'alt="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
 			}
 
 			if ( event.load && event.format !== 'raw' ) {
@@ -144,10 +144,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 						'data-wp-preserve="' + encodeURIComponent( match ) + '" ' +
 						'data-mce-resize="false" ' +
 						'data-mce-placeholder="1" '+
-						'class="mce-object" ' +
+						'class="mce-object mce-object-' + tag + '" ' +
 						'width="20" height="20" '+
 						'alt="&lt;' + tag + '&gt;" ' +
-						'title="&lt;' + tag + '&gt;" ' +
 					'/>';
 				} );
 			}
@@ -214,7 +213,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		classname += ' mce-wp-' + tag;
 		title = tag === 'more' ? 'Read more...' : 'Next page';
 		title = __( title );
-		html = '<img src="' + tinymce.Env.transparentSrc + '" alt="" title="' + title + '" class="' + classname + '" ' +
+		html = '<img src="' + tinymce.Env.transparentSrc + '" alt="' + title + '" class="' + classname + '" ' +
 			'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="1" />';
 
 		// Most common case.

src/js/_enqueues/vendor/tinymce/skins/wordpress/images/script.svg

@@ -160,6 +160,14 @@ img[data-mce-selected]::selection {
 	background: transparent url( images/pagebreak.png ) repeat-y scroll center center;
 }
 
+.mce-object-style {
+	background-image: url( images/style.svg );
+}
+
+.mce-object-script {
+	background-image: url( images/script.svg );
+}
+
 /* Styles for formatting the boundaries of anchors and code elements */
 .mce-content-body a[data-mce-selected] {
 	padding: 0 2px;