Merge branch 'trunk' into remove-ie-conditionals

Author: joedolson

.github/workflows/phpunit-tests.yml

@@ -202,8 +202,8 @@ jobs:
       matrix:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        db-type: [ 'mysql' ]
-        db-version: [ '9.4' ]
+        db-type: [ 'mysql', 'mariadb' ]
+        db-version: [ '9.4', '12.0' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
@@ -214,6 +214,11 @@ jobs:
             db-version: '9.4'
           - php: '7.3'
             db-version: '9.4'
+          # Exclude version combinations that don't exist.
+          - db-type: 'mariadb'
+            db-version: '9.4'
+          - db-type: 'mysql'
+            db-version: '12.0'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}

Gruntfile.js

@@ -838,8 +838,17 @@ module.exports = function(grunt) {
 					'!**/*.min.js',
 					'!wp-admin/js/custom-header.js', // Why? We should minify this.
 					'!wp-admin/js/farbtastic.js',
+					'!wp-includes/js/wp-emoji-loader.js', // This is a module. See the emoji-loader task below.
 				]
 			},
+			'emoji-loader': {
+				options: {
+					module: true,
+					toplevel: true,
+				},
+				src: WORKING_DIR + 'wp-includes/js/wp-emoji-loader.js',
+				dest: WORKING_DIR + 'wp-includes/js/wp-emoji-loader.min.js',
+			},
 			'jquery-ui': {
 				options: {
 					// Preserve comments that start with a bang.
@@ -1549,6 +1558,7 @@ module.exports = function(grunt) {
 
 	grunt.registerTask( 'uglify:all', [
 		'uglify:core',
+		'uglify:emoji-loader',
 		'uglify:jquery-ui',
 		'uglify:imgareaselect',
 		'uglify:jqueryform',