Merge remote-tracking branch 'origin/trunk' into feature/add-on-to-pr9641

Author: samueljseay

Gruntfile.js

@@ -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.

package-lock.json

@@ -29,9 +29,9 @@
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
 		"@wordpress/babel-preset-default": "8.33.1",
 		"@wordpress/dependency-extraction-webpack-plugin": "6.33.1",
-		"@wordpress/e2e-test-utils-playwright": "1.33.1",
+		"@wordpress/e2e-test-utils-playwright": "1.33.2",
 		"@wordpress/prettier-config": "4.33.1",
-		"@wordpress/scripts": "30.26.1",
+		"@wordpress/scripts": "30.26.2",
 		"autoprefixer": "10.4.20",
 		"chalk": "5.4.1",
 		"check-node-version": "4.2.1",
@@ -76,76 +76,76 @@
 	},
 	"dependencies": {
 		"@wordpress/a11y": "4.33.1",
-		"@wordpress/admin-ui": "1.1.1",
+		"@wordpress/admin-ui": "1.1.2",
 		"@wordpress/annotations": "3.33.1",
 		"@wordpress/api-fetch": "7.33.1",
 		"@wordpress/autop": "4.33.1",
 		"@wordpress/base-styles": "6.9.1",
 		"@wordpress/blob": "4.33.1",
-		"@wordpress/block-directory": "5.33.5",
-		"@wordpress/block-editor": "15.6.3",
-		"@wordpress/block-library": "9.33.4",
+		"@wordpress/block-directory": "5.33.6",
+		"@wordpress/block-editor": "15.6.4",
+		"@wordpress/block-library": "9.33.5",
 		"@wordpress/block-serialization-default-parser": "5.33.1",
 		"@wordpress/blocks": "15.6.1",
-		"@wordpress/commands": "1.33.1",
-		"@wordpress/components": "30.6.1",
+		"@wordpress/commands": "1.33.2",
+		"@wordpress/components": "30.6.2",
 		"@wordpress/compose": "7.33.1",
-		"@wordpress/core-commands": "1.33.3",
-		"@wordpress/core-data": "7.33.3",
-		"@wordpress/customize-widgets": "5.33.4",
+		"@wordpress/core-commands": "1.33.4",
+		"@wordpress/core-data": "7.33.4",
+		"@wordpress/customize-widgets": "5.33.5",
 		"@wordpress/data": "10.33.1",
 		"@wordpress/data-controls": "4.33.1",
-		"@wordpress/dataviews": "10.1.2",
+		"@wordpress/dataviews": "10.1.3",
 		"@wordpress/date": "5.33.1",
 		"@wordpress/deprecated": "4.33.1",
 		"@wordpress/dom": "4.33.1",
 		"@wordpress/dom-ready": "4.33.1",
-		"@wordpress/edit-post": "8.33.5",
-		"@wordpress/edit-site": "6.33.5",
-		"@wordpress/edit-widgets": "6.33.4",
-		"@wordpress/editor": "14.33.5",
+		"@wordpress/edit-post": "8.33.6",
+		"@wordpress/edit-site": "6.33.6",
+		"@wordpress/edit-widgets": "6.33.5",
+		"@wordpress/editor": "14.33.6",
 		"@wordpress/element": "6.33.1",
 		"@wordpress/escape-html": "3.33.1",
-		"@wordpress/fields": "0.25.5",
-		"@wordpress/format-library": "5.33.3",
+		"@wordpress/fields": "0.25.6",
+		"@wordpress/format-library": "5.33.4",
 		"@wordpress/hooks": "4.33.1",
 		"@wordpress/html-entities": "4.33.1",
 		"@wordpress/i18n": "6.6.1",
 		"@wordpress/icons": "11.0.1",
 		"@wordpress/interactivity": "6.33.1",
 		"@wordpress/interactivity-router": "2.33.1",
-		"@wordpress/interface": "9.18.1",
+		"@wordpress/interface": "9.18.2",
 		"@wordpress/is-shallow-equal": "5.33.1",
 		"@wordpress/keyboard-shortcuts": "5.33.1",
 		"@wordpress/keycodes": "4.33.1",
 		"@wordpress/latex-to-mathml": "1.1.1",
-		"@wordpress/list-reusable-blocks": "5.33.1",
+		"@wordpress/list-reusable-blocks": "5.33.2",
 		"@wordpress/media-utils": "5.33.1",
 		"@wordpress/notices": "5.33.1",
-		"@wordpress/nux": "9.33.1",
-		"@wordpress/patterns": "2.33.3",
-		"@wordpress/plugins": "7.33.1",
-		"@wordpress/preferences": "4.33.1",
+		"@wordpress/nux": "9.33.2",
+		"@wordpress/patterns": "2.33.4",
+		"@wordpress/plugins": "7.33.2",
+		"@wordpress/preferences": "4.33.2",
 		"@wordpress/preferences-persistence": "2.33.1",
 		"@wordpress/primitives": "4.33.1",
 		"@wordpress/priority-queue": "3.33.1",
 		"@wordpress/private-apis": "1.33.1",
 		"@wordpress/redux-routine": "5.33.1",
-		"@wordpress/reusable-blocks": "5.33.3",
+		"@wordpress/reusable-blocks": "5.33.4",
 		"@wordpress/rich-text": "7.33.1",
 		"@wordpress/router": "1.33.1",
-		"@wordpress/server-side-render": "6.9.1",
+		"@wordpress/server-side-render": "6.9.2",
 		"@wordpress/shortcode": "4.33.1",
 		"@wordpress/style-engine": "2.33.1",
 		"@wordpress/sync": "1.33.1",
 		"@wordpress/token-list": "3.33.1",
 		"@wordpress/undo-manager": "1.33.1",
-		"@wordpress/upload-media": "0.18.1",
+		"@wordpress/upload-media": "0.18.2",
 		"@wordpress/url": "4.33.1",
 		"@wordpress/viewport": "6.33.1",
-		"@wordpress/views": "1.0.3",
+		"@wordpress/views": "1.0.4",
 		"@wordpress/warning": "3.33.1",
-		"@wordpress/widgets": "4.33.3",
+		"@wordpress/widgets": "4.33.4",
 		"@wordpress/wordcount": "4.33.1",
 		"backbone": "1.6.0",
 		"clipboard": "2.0.11",

package.json

@@ -114,4 +114,12 @@
 		<exclude-pattern>/sodium_compat/src/PHP52/SplFixedArray\.php$</exclude-pattern>
 	</rule>
 
+	<!--
+		Excluded while waiting for PHPCompatibility v10.
+		See <https://github.com/PHPCompatibility/PHPCompatibility/issues/1481>.
+	-->
+	<rule ref="PHPCompatibility.FunctionDeclarations.NewClosure.ThisFoundInStatic">
+		<exclude-pattern>/src/wp-includes/script-loader\.php$</exclude-pattern>
+	</rule>
+
 </ruleset>

phpcompat.xml.dist

@@ -4,6 +4,11 @@ var twemoji = (function (
     https://github.com/jdecked/twemoji/blob/gh-pages/LICENSE
   */
 
+  /*
+   * Note: this file was modified in two places to add support for a doNotParse() callback.
+   * The modifications are surrounded by `// WP start` and `// WP end` comments.
+   */
+
   // WARNING:   this file is generated automatically via
   //            `node scripts/build.js`
   //            please update its `createTwemoji` function
@@ -305,6 +310,14 @@ var twemoji = (function (
       // should not be parsed as script, style, and others
       else if (nodeType === 1 && !('ownerSVGElement' in subnode) &&
           !shouldntBeParsed.test(subnode.nodeName.toLowerCase())) {
+
+        // WP start
+        // Use doNotParse() callback if set.
+        if ( twemoji.doNotParse && twemoji.doNotParse( subnode ) ) {
+            continue;
+        }
+        // WP end
+
         grabAllTextNodes(subnode, allText);
       }
     }
@@ -520,6 +533,14 @@ var twemoji = (function (
     if (!how || typeof how === 'function') {
       how = {callback: how};
     }
+
+	// WP start
+    // Allow passing of the doNotParse() callback in the settings.
+    // The callback is used in `grabAllTextNodes()` (DOM mode only) as a filter
+    // that allows bypassing of some of the text nodes. It gets the current subnode as argument.
+    twemoji.doNotParse = how.doNotParse;
+    // WP end
+
     // if first argument is string, inject html <img> tags
     // otherwise use the DOM tree and parse text nodes only
     return (typeof what === 'string' ? parseString : parseNode)(what, {

src/js/_enqueues/vendor/twemoji.js

@@ -99,7 +99,11 @@ public function prepare_items() {
 			$comment_status = 'all';
 		}
 
-		$comment_type = ! empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
+		$comment_type = '';
+
+		if ( ! empty( $_REQUEST['comment_type'] ) && 'note' !== $_REQUEST['comment_type'] ) {
+			$comment_type = $_REQUEST['comment_type'];
+		}
 
 		$search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -560,6 +560,10 @@ function populate_options( array $options = array() ) {
 
 		// 6.4.0
 		'wp_attachment_pages_enabled'     => 0,
+
+		// 6.9.0
+		'wp_notes_notify'                 => 1,
+
 	);
 
 	// 3.3.0

src/wp-admin/includes/schema.php

@@ -160,6 +160,11 @@
 <label for="moderation_notify">
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked( '1', get_option( 'moderation_notify' ) ); ?> />
 <?php _e( 'A comment is held for moderation' ); ?> </label>
+<br />
+<label for="wp_notes_notify">
+<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify' ) ); ?> />
+<?php _e( 'Anyone posts a note' ); ?> </label>
+
 </fieldset></td>
 </tr>
 <?php $before_comment_appears_title = __( 'Before a comment appears' ); ?>

src/wp-admin/options-discussion.php

@@ -125,6 +125,7 @@
 		'comment_order',
 		'comment_registration',
 		'show_comments_cookies_opt_in',
+		'wp_notes_notify',
 	),
 	'media'      => array(
 		'thumbnail_size_w',

src/wp-admin/options.php

@@ -244,9 +244,7 @@ static function ( $classes ) {
 			);
 		}
 	}
-} elseif ( isset( $_GET['p'] ) && '/' !== $_GET['p'] ) {
-	// Only prefetch for the root. If we preload it for all pages and it's not
-	// used it won't be possible to invalidate.
+} else {
 	$preload_paths[] = '/wp/v2/templates/lookup?slug=front-page';
 	$preload_paths[] = '/wp/v2/templates/lookup?slug=home';
 }