Merge branch 'trunk' into patch/15448v2

Author: westonruter

.git-blame-ignore-revs

@@ -61,4 +61,14 @@ d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
 a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
 
 # 6.9 Coding Standards
+d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
+c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
 cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
+3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
+b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
+ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
+08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
+e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
+8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
+87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
+db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

Gruntfile.js

@@ -1159,7 +1159,7 @@ module.exports = function(grunt) {
 								}
 
 								// Fetch a list of the files that Twemoji supplies.
-								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v17.0.1:assets/svg") {... on Tree {entries {name}}}}}';
+								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "gh-pages:v/17.0.2/svg") {... on Tree {entries {name}}}}}';
 								files = spawn( 'gh', [ 'api', 'graphql', '-f', query] );
 
 								if ( 0 !== files.status ) {
@@ -1785,9 +1785,6 @@ module.exports = function(grunt) {
 		const ignoredFiles = [
 			'build/wp-includes/js/dist/components.js',
 			'build/wp-includes/js/dist/data.js',
-			// We have a problem where Yjs is being bundled in core-data.
-			// Ignoring this file until we find a solution.
-			'build/wp-includes/js/dist/core-data.js',
 		];
 		const files = buildFiles.reduce( ( acc, path ) => {
 			// Skip excluded paths and any path that isn't a file.

composer.json

@@ -19,7 +19,7 @@
 		"ext-dom": "*"
 	},
 	"require-dev": {
-		"composer/ca-bundle": "1.5.8",
+		"composer/ca-bundle": "1.5.9",
 		"squizlabs/php_codesniffer": "3.13.2",
 		"wp-coding-standards/wpcs": "~3.2.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",