Below is a differential between the unpatched vulnerable code and the patched update, for reference.
--- a/jetpack/_inc/blocks/ai-chat/view.asset.php
+++ b/jetpack/_inc/blocks/ai-chat/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-polyfill'), 'version' => 'af8cf14e75fd2d51ce6e');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-polyfill'), 'version' => 'e5eb22c18228bc67fcfb');
--- a/jetpack/_inc/blocks/blogging-prompt/view.asset.php
+++ b/jetpack/_inc/blocks/blogging-prompt/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'c338606afa1d9298a4fe');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '5182e0629d0214a32263');
--- a/jetpack/_inc/blocks/blogroll/view.asset.php
+++ b/jetpack/_inc/blocks/blogroll/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '9136ab9f1b3317920726');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '32a8501e8647dda360bd');
--- a/jetpack/_inc/blocks/business-hours/view.asset.php
+++ b/jetpack/_inc/blocks/business-hours/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '7b9b13c9b0dc24c6350e');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '015c90376027208061a7');
--- a/jetpack/_inc/blocks/button/view.asset.php
+++ b/jetpack/_inc/blocks/button/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'd893042b95edc7bb611a');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '966dd642fdcc7ec34770');
--- a/jetpack/_inc/blocks/calendly/view.asset.php
+++ b/jetpack/_inc/blocks/calendly/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '1920eabaec8a9a9d174e');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '2c6dcab855ebf648b7a9');
--- a/jetpack/_inc/blocks/contact-info/view.asset.php
+++ b/jetpack/_inc/blocks/contact-info/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '0a0aeb0ea5dc58158021');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'aebc1f4d75f21cfa2f41');
--- a/jetpack/_inc/blocks/cookie-consent/view.asset.php
+++ b/jetpack/_inc/blocks/cookie-consent/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '2c574df699677fdc8f42');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => 'b355f9f8e16c798a11dd');
--- a/jetpack/_inc/blocks/donations/view.asset.php
+++ b/jetpack/_inc/blocks/donations/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill', 'wp-url'), 'version' => '6e345f174fcb3290ef09');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill', 'wp-url'), 'version' => 'b9368199f8145e9f43b0');
--- a/jetpack/_inc/blocks/editor-beta.asset.php
+++ b/jetpack/_inc/blocks/editor-beta.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => '34d25194d1641304b6af');
+<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'moment', 'react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => '21b73ac3c6465e4e8ad2');
--- a/jetpack/_inc/blocks/editor-experimental.asset.php
+++ b/jetpack/_inc/blocks/editor-experimental.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => '535a35883eeca86c626f');
+<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'moment', 'react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => '6ce6390a629d45fb7f23');
--- a/jetpack/_inc/blocks/editor-no-post-editor.asset.php
+++ b/jetpack/_inc/blocks/editor-no-post-editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '19082b1797aa929383f9');
+<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'moment', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'dfc086960d9ed18d480c');
--- a/jetpack/_inc/blocks/editor.asset.php
+++ b/jetpack/_inc/blocks/editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => '197fc7d7b91294a037e5');
+<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'moment', 'react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-token-list', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => 'a4a95d7d59da224fdd2b');
--- a/jetpack/_inc/blocks/eventbrite/view.asset.php
+++ b/jetpack/_inc/blocks/eventbrite/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '5c24c0cdf64cd8368a08');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '93b614c160c025193e3f');
--- a/jetpack/_inc/blocks/gif/view.asset.php
+++ b/jetpack/_inc/blocks/gif/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'cfa333356a97995d0eaa');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'a1b1c6c503f30bcab4ec');
--- a/jetpack/_inc/blocks/goodreads/view.asset.php
+++ b/jetpack/_inc/blocks/goodreads/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'a7c372dc3714bccf1589');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '4f6c55862658b54769e5');
--- a/jetpack/_inc/blocks/google-calendar/view.asset.php
+++ b/jetpack/_inc/blocks/google-calendar/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'ec78a0ad105e45c0cbab');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '6b7eb23ded175447060f');
--- a/jetpack/_inc/blocks/google-docs-embed/view.asset.php
+++ b/jetpack/_inc/blocks/google-docs-embed/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '85fda931b8204a116d93');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '19655f0a431e79c898b1');
--- a/jetpack/_inc/blocks/image-compare/view.asset.php
+++ b/jetpack/_inc/blocks/image-compare/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => 'f3ba866ed9b51d74d99f');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '52db62d48c395da47325');
--- a/jetpack/_inc/blocks/instagram-gallery/view.asset.php
+++ b/jetpack/_inc/blocks/instagram-gallery/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '9478abc734adde1247b3');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'eac6f0b5fc3e121e5481');
--- a/jetpack/_inc/blocks/mailchimp/view.asset.php
+++ b/jetpack/_inc/blocks/mailchimp/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '7dd146ea04a0b5c84633');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => '4473d28302b2dbe888de');
--- a/jetpack/_inc/blocks/map/view.asset.php
+++ b/jetpack/_inc/blocks/map/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '6ab1f612994c836bd7b4');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '78efb11548444dec05ee');
--- a/jetpack/_inc/blocks/nextdoor/view.asset.php
+++ b/jetpack/_inc/blocks/nextdoor/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'f45cb2ca17fefb71e0c3');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '0489bf2f755faa1d84ec');
--- a/jetpack/_inc/blocks/opentable/view.asset.php
+++ b/jetpack/_inc/blocks/opentable/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'f23ee73c32d50167f7be');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '6643e334b11a15caaede');
--- a/jetpack/_inc/blocks/payment-buttons/view.asset.php
+++ b/jetpack/_inc/blocks/payment-buttons/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '7d467b551780bf0399bf');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '1fdfa4fe6240a9ab1ba5');
--- a/jetpack/_inc/blocks/podcast-player/view.asset.php
+++ b/jetpack/_inc/blocks/podcast-player/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '0a42a23f7f5da20ed77d');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => 'cb954b1e124d23d21e02');
--- a/jetpack/_inc/blocks/premium-content/view.asset.php
+++ b/jetpack/_inc/blocks/premium-content/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '3dba9e1ba39243f5a6a8');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '31f9839a9478d3cc6d55');
--- a/jetpack/_inc/blocks/rating-star/view.asset.php
+++ b/jetpack/_inc/blocks/rating-star/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '249c43d6ec4100fed0d3');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '01d8248d02f84edd7490');
--- a/jetpack/_inc/blocks/recipe/view.asset.php
+++ b/jetpack/_inc/blocks/recipe/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '5210f83dfb816f5faa67');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => 'c8230bb7c29b8fc20084');
--- a/jetpack/_inc/blocks/recurring-payments/view.asset.php
+++ b/jetpack/_inc/blocks/recurring-payments/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '99c4fae20e87a29bb8fc');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '96639808cf6a5b0339ee');
--- a/jetpack/_inc/blocks/repeat-visitor/view.asset.php
+++ b/jetpack/_inc/blocks/repeat-visitor/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'dfb5a766d9008f6d8b91');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'eb1a98f7fe01fa47bd6f');
--- a/jetpack/_inc/blocks/send-a-message/view.asset.php
+++ b/jetpack/_inc/blocks/send-a-message/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'ecc3d3265ff0117eee7b');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '55b16ceb57cbf70e9633');
--- a/jetpack/_inc/blocks/sharing-button/view.asset.php
+++ b/jetpack/_inc/blocks/sharing-button/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '86fe516550c4ae6475fe');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '5231dd3e4c3538cac476');
--- a/jetpack/_inc/blocks/sharing-buttons/view.asset.php
+++ b/jetpack/_inc/blocks/sharing-buttons/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '1769f9e2d0237d2e1558');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '2f5b08f8fcbda634bcde');
--- a/jetpack/_inc/blocks/slideshow/view.asset.php
+++ b/jetpack/_inc/blocks/slideshow/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-escape-html', 'wp-i18n', 'wp-polyfill'), 'version' => '102b4410d5bb7c1470ca');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-escape-html', 'wp-i18n', 'wp-polyfill'), 'version' => '8972ad953c4994ff9671');
--- a/jetpack/_inc/blocks/story/view.asset.php
+++ b/jetpack/_inc/blocks/story/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '6a05542acf1273ffe113');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '4f7f601204ec19ed491c');
--- a/jetpack/_inc/blocks/subscriptions/view.asset.php
+++ b/jetpack/_inc/blocks/subscriptions/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '849e8fffded090beaf45');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => '178297bd30cb50c591e0');
--- a/jetpack/_inc/blocks/tiled-gallery/view.asset.php
+++ b/jetpack/_inc/blocks/tiled-gallery/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => 'ba1cb55c34134e986d39');
+<?php return array('dependencies' => array('wp-dom-ready', 'wp-polyfill'), 'version' => 'f0571a42d7c9277d6946');
--- a/jetpack/_inc/blocks/tock/view.asset.php
+++ b/jetpack/_inc/blocks/tock/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '211983e7c0889099c52d');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '4b0702569458a4a8eebf');
--- a/jetpack/_inc/blocks/top-posts/view.asset.php
+++ b/jetpack/_inc/blocks/top-posts/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '44d5ef2bdc48d09ce19b');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'acdb4ccfec08b62c30cc');
--- a/jetpack/_inc/build/admin.asset.php
+++ b/jetpack/_inc/build/admin.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '591f099e1e9dafd17b0b');
+<?php return array('dependencies' => array('jetpack-script-data', 'jquery', 'lodash', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '6979d4d515838fd27594');
--- a/jetpack/_inc/build/carousel/swiper-bundle.min.asset.php
+++ b/jetpack/_inc/build/carousel/swiper-bundle.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '7b3686d7a69872633831');
+<?php return array('dependencies' => array(), 'version' => '2864c68e8b7d87606467');
--- a/jetpack/_inc/build/custom-css/custom-css/js/core-customizer-css-preview.min.asset.php
+++ b/jetpack/_inc/build/custom-css/custom-css/js/core-customizer-css-preview.min.asset.php
@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => '655ba517f6e042c1920f');
--- a/jetpack/_inc/build/custom-css/custom-css/js/core-customizer-css.core-4.9.min.asset.php
+++ b/jetpack/_inc/build/custom-css/custom-css/js/core-customizer-css.core-4.9.min.asset.php
@@ -1 +0,0 @@
-<?php return array('dependencies' => array(), 'version' => 'f57a5b1ee88c5c021ed7');
--- a/jetpack/_inc/build/infinite-scroll/infinity.min.asset.php
+++ b/jetpack/_inc/build/infinite-scroll/infinity.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'cb061d270dfd713443a2');
+<?php return array('dependencies' => array(), 'version' => 'c47cc021f1cc5b710ae4');
--- a/jetpack/_inc/build/plugins-page.asset.php
+++ b/jetpack/_inc/build/plugins-page.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '379ff3291c0011ed1352');
+<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'c852fd08ec9ffb85fe82');
--- a/jetpack/_inc/build/shortcodes/js/jmpress.min.asset.php
+++ b/jetpack/_inc/build/shortcodes/js/jmpress.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '43f98ad2f06c20fafa75');
+<?php return array('dependencies' => array(), 'version' => '2c16055d1663b8e10e85');
--- a/jetpack/_inc/build/shortcodes/js/slideshow-shortcode.min.asset.php
+++ b/jetpack/_inc/build/shortcodes/js/slideshow-shortcode.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'e0a84a8c368b879fa9d3');
+<?php return array('dependencies' => array(), 'version' => '54fa49c1df5f613a4b72');
--- a/jetpack/_inc/build/videopress/js/videopress-plupload.min.asset.php
+++ b/jetpack/_inc/build/videopress/js/videopress-plupload.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'c72c16af3a35fdd01f93');
+<?php return array('dependencies' => array(), 'version' => 'e8b37356027976ebb64d');
--- a/jetpack/_inc/build/widget-visibility/editor/index.asset.php
+++ b/jetpack/_inc/build/widget-visibility/editor/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '7a914f0451cc7dd8e334');
+<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '6275defef40dbf464de8');
--- a/jetpack/_inc/build/widgets/google-translate/google-translate.min.asset.php
+++ b/jetpack/_inc/build/widgets/google-translate/google-translate.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '14948f0a0cbdd669a5f3');
+<?php return array('dependencies' => array(), 'version' => 'cc3a3abf40e5e8fe2fcb');
--- a/jetpack/_inc/build/widgets/simple-payments/customizer.min.asset.php
+++ b/jetpack/_inc/build/widgets/simple-payments/customizer.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '853019e4a98723a3d1f3');
+<?php return array('dependencies' => array(), 'version' => 'dd917aab906c3efa97dd');
--- a/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
+++ b/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
@@ -248,7 +248,7 @@
'isSubscriptionSiteEnabled' => apply_filters( 'jetpack_subscription_site_enabled', false ),
'newsletterDateExample' => gmdate( get_option( 'date_format' ), time() ),
'subscriptionSiteEditSupported' => $current_theme->is_block_theme(),
- 'isGoogleAnalyticsActive' => ( new Modules() )->is_active( 'google-analytics', false ),
+ 'isMasterbarActive' => ( new Modules() )->is_active( 'masterbar', false ),
);
}
--- a/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
+++ b/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -1,5 +1,6 @@
<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+use AutomatticJetpackAdmin_UIAdmin_Menu;
use AutomatticJetpackAssetsLogo;
use AutomatticJetpackConnectionInitial_State as Connection_Initial_State;
use AutomatticJetpackConnectionManager as Connection_Manager;
@@ -78,6 +79,21 @@
}
/**
+ * Remove the main Jetpack submenu if a site is in offline mode or connected.
+ * At that point, admins can access the Jetpack Dashboard instead.
+ *
+ * @since 13.8
+ */
+ public function remove_jetpack_menu() {
+ if (
+ ( new Status() )->is_offline_mode()
+ || Jetpack::is_connection_ready()
+ ) {
+ remove_submenu_page( 'jetpack', 'jetpack' );
+ }
+ }
+
+ /**
* Add Jetpack Dashboard sub-link and point it to AAG if the user can view stats, manage modules or if Protect is active.
*
* Works in Dev Mode or when user is connected.
@@ -86,8 +102,14 @@
*/
public function jetpack_add_dashboard_sub_nav_item() {
if ( ( new Status() )->is_offline_mode() || Jetpack::is_connection_ready() ) {
- add_submenu_page( 'jetpack', __( 'Dashboard', 'jetpack' ), __( 'Dashboard', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/dashboard', '__return_null', 1 );
- remove_submenu_page( 'jetpack', 'jetpack' );
+ Admin_Menu::add_menu(
+ __( 'Dashboard', 'jetpack' ),
+ __( 'Dashboard', 'jetpack' ),
+ 'jetpack_admin_page',
+ Jetpack::admin_url( array( 'page' => 'jetpack#/dashboard' ) ),
+ null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- See https://core.trac.wordpress.org/ticket/52539.
+ 14
+ );
}
}
@@ -165,7 +187,14 @@
*/
public function jetpack_add_settings_sub_nav_item() {
if ( $this->can_access_settings() ) {
- add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/settings', '__return_null' );
+ Admin_Menu::add_menu(
+ __( 'Settings', 'jetpack' ),
+ __( 'Settings', 'jetpack' ),
+ 'jetpack_admin_page',
+ Jetpack::admin_url( array( 'page' => 'jetpack#/settings' ) ),
+ null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- See https://core.trac.wordpress.org/ticket/52539.
+ 13
+ );
}
}
--- a/jetpack/_inc/lib/class-jetpack-ai-helper.php
+++ b/jetpack/_inc/lib/class-jetpack-ai-helper.php
@@ -366,6 +366,17 @@
}
}
+ if ( ! class_exists( 'WPCOMJetpack_AIFeature_Control' ) ) {
+ if ( is_readable( WP_CONTENT_DIR . '/lib/jetpack-ai/feature-control.php' ) ) {
+ require_once WP_CONTENT_DIR . '/lib/jetpack-ai/feature-control.php';
+ } else {
+ return new WP_Error(
+ 'jetpack_ai_feature_control_not_found',
+ __( 'WPCOMJetpack_AIFeature_Control class not found.', 'jetpack' )
+ );
+ }
+ }
+
// Determine the upgrade type
$upgrade_type = wpcom_is_vip( $blog_id ) ? 'vip' : 'default';
@@ -383,6 +394,7 @@
'tier-plans' => WPCOMJetpack_AIUsageHelper::get_tier_plans_list(),
'tier-plans-enabled' => WPCOMJetpack_AIUsageHelper::ai_tier_plans_enabled(),
'costs' => WPCOMJetpack_AIUsageHelper::get_costs(),
+ 'features-control' => WPCOMJetpack_AIFeature_Control::get_features(),
);
}
--- a/jetpack/_inc/lib/class-jetpack-google-drive-helper.php
+++ b/jetpack/_inc/lib/class-jetpack-google-drive-helper.php
@@ -1,133 +0,0 @@
-<?php
-/**
- * Google Drive helper.
- *
- * @deprecated 13.4 Use automattic/jetpack-forms
- * @package automattic/jetpack
- */
-
-use AutomatticJetpackConnectionClient;
-use AutomatticJetpackConnectionManager;
-use AutomatticJetpackStatusVisitor;
-
-/**
- * Class Jetpack_Google_Drive_Helper
- *
- * @deprecated 13.4 Use AutomatticJetpackFormsServiceGoogle_Drive_Helper
- */
-class Jetpack_Google_Drive_Helper {
- /**
- * Checks if the user has a valid connection to Google Drive
- *
- * @deprecated 13.4 Use AutomatticJetpackFormsServiceGoogle_Drive_Helper->has_valid_connection
- * @param int $user_id The user ID.
- * @return array Array with single 'valid' (bool) entry.
- */
- public static function has_valid_connection( $user_id ) {
- _deprecated_function( __METHOD__, 'jetpack-13.4', 'AutomatticJetpackFormsServiceGoogle_Drive_Helper->has_valid_connection' );
- $site_id = Manager::get_site_id();
- if ( is_wp_error( $site_id ) ) {
- return false;
- }
-
- if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
- // check for gdrive helper class, call synchronously on .com
- require_lib( 'google-sheets-helper' );
- $user_id = (int) get_current_user_id();
- $token = WPCOM_Google_Sheets_helper::get_google_drive_token_for_user_id( $user_id );
-
- return ! is_wp_error( $token ) && ! $token->is_expired();
- }
-
- $request_path = sprintf( '/sites/%d/google-drive/connection', $site_id );
- $wpcom_request = Client::wpcom_json_api_request_as_user(
- $request_path,
- '2',
- array(
- 'method' => 'GET',
- 'headers' => array(
- 'content-type' => 'application/json',
- 'X-Forwarded-For' => ( new Visitor() )->get_ip( true ),
- ),
- )
- );
-
- $response_code = wp_remote_retrieve_response_code( $wpcom_request );
- if ( 200 !== $response_code ) {
- return new WP_Error(
- 'failed_to_fetch_data',
- esc_html__( 'Unable to fetch the requested data.', 'jetpack' ),
- array( 'status' => $response_code )
- );
- }
- $result = json_decode( wp_remote_retrieve_body( $wpcom_request ), true );
-
- return ! empty( $result ) && ! empty( $result['valid'] );
- }
-
- /**
- * Creates a Google Spreadsheet and returns some of its meta
- *
- * @deprecated 13.4 Use AutomatticJetpackFormsServiceGoogle_Drive_Helper->create_sheet
- * @param int $user_id The user ID.
- * @param string $title The spreadsheet title.
- * @param array $rows Array of arrays with values.
- * @return array|WP_Error
- */
- public static function create_sheet( $user_id, $title, $rows = array() ) {
- _deprecated_function( __METHOD__, 'jetpack-13.4', 'AutomatticJetpackFormsServiceGoogle_Drive_Helper->create_sheet' );
- $site_id = Manager::get_site_id();
- if ( is_wp_error( $site_id ) ) {
- return false;
- }
-
- if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
- // check for gdrive helper class, call synchronously on .com
- require_lib( 'google-sheets-helper' );
- $helper = WPCOM_Google_Sheets_helper::create_for_user( $user_id );
-
- if ( is_wp_error( $helper ) ) {
- return $helper;
- }
-
- $spreadsheet = $helper->create_spreadsheet( $title, $rows );
-
- if ( is_wp_error( $spreadsheet ) ) {
- return $spreadsheet;
- }
-
- return array(
- // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- as is on google client
- 'sheet_link' => $spreadsheet->spreadsheetUrl,
- // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- as is on google client
- 'sheet_id' => $spreadsheet->spreadsheetId,
- );
- }
-
- $request_path = sprintf( '/sites/%d/google-drive/sheets', $site_id );
- $wpcom_request = Client::wpcom_json_api_request_as_user(
- $request_path,
- '2',
- array(
- 'method' => 'POST',
- 'headers' => array(
- 'content-type' => 'application/json',
- 'X-Forwarded-For' => ( new Visitor() )->get_ip( true ),
- ),
- ),
- array(
- 'title' => $title,
- 'rows' => $rows,
- )
- );
- $response_code = wp_remote_retrieve_response_code( $wpcom_request );
- if ( 200 !== $response_code ) {
- return new WP_Error(
- 'failed_to_fetch_data',
- esc_html__( 'Unable to fetch the requested data.', 'jetpack' ),
- array( 'status' => $response_code )
- );
- }
- return json_decode( wp_remote_retrieve_body( $wpcom_request ), true );
- }
-}
--- a/jetpack/_inc/lib/class-jetpack-top-posts-helper.php
+++ b/jetpack/_inc/lib/class-jetpack-top-posts-helper.php
@@ -44,6 +44,14 @@
$data = array( 'summary' => array( 'postviews' => array() ) );
}
+ // Remove posts that have subsequently been deleted.
+ $data['summary']['postviews'] = array_filter(
+ $data['summary']['postviews'],
+ function ( $item ) {
+ return get_post_status( $item['id'] ) === 'publish';
+ }
+ );
+
$posts_retrieved = is_countable( $data['summary']['postviews'] ) ? count( $data['summary']['postviews'] ) : 0;
// Fallback to random posts if user does not have enough top content.
--- a/jetpack/_inc/lib/class.color.php
+++ b/jetpack/_inc/lib/class.color.php
@@ -36,6 +36,8 @@
* One of hex (default), rgb, hsl, int.
*/
public function __construct( $color = null, $type = 'hex' ) {
+ _deprecated_function( 'Jetpack_Color::__construct', 'jetpack-13.8' );
+
if ( $color ) {
switch ( $type ) {
case 'hex':
--- a/jetpack/_inc/lib/class.media-extractor.php
+++ b/jetpack/_inc/lib/class.media-extractor.php
@@ -32,10 +32,12 @@
* @var string[]
*/
private static $keeper_shortcodes = array(
+ 'audio',
'youtube',
'vimeo',
'hulu',
'ted',
+ 'video',
'wpvideo',
'videopress',
);
@@ -197,6 +199,11 @@
$id = call_user_func( $shortcode_get_id_func, $attr );
} elseif ( method_exists( $shortcode_class_name, $shortcode_get_id_method ) ) {
$id = call_user_func( array( $shortcode_class_name, $shortcode_get_id_method ), $attr );
+ } elseif ( 'video' === $shortcode ) {
+ $id = $attr['src'] ?? $attr['url'] ?? $attr['mp4'] ?? $attr['m4v'] ?? $attr['webm'] ?? $attr['ogv'] ?? $attr['wmv'] ?? $attr['flv'] ?? null;
+ } elseif ( 'audio' === $shortcode ) {
+ preg_match( '#(https?://(?:[^s"|']+).(?:mp3|ogg|flac|m4a|wav))([ "'|]|$)#', implode( ' ', $attr ), $audio_matches );
+ $id = $audio_matches[1] ?? null;
}
if ( ! empty( $id )
&& ( ! isset( $shortcode_details[ $shortcode_name ] ) || ! in_array( $id, $shortcode_details[ $shortcode_name ], true ) ) ) {
--- a/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php
+++ b/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-admin-menu.php
@@ -6,8 +6,6 @@
* @since 9.1.0
*/
-use AutomatticJetpackStatusHost;
-
/**
* Class WPCOM_REST_API_V2_Endpoint_Admin_Menu
*/
@@ -85,9 +83,6 @@
* @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
*/
public function get_item( $request ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
- if ( ! ( new Host() )->is_wpcom_platform() && get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
- require_once JETPACK__PLUGIN_DIR . 'jetpack_vendor/automattic/jetpack-masterbar/src/admin-menu/load.php';
- }
// All globals need to be declared for menu items to properly register.
global $admin_page_hooks, $menu, $menu_order, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
@@ -119,13 +114,11 @@
remove_action( 'customize_register', array( 'Jetpack_Fonts_Typekit', 'maybe_override_for_advanced_mode' ), 20 );
- // TODO: Remove the conditional when we start using the package code on WPCOM.
if ( class_exists( 'AutomatticJetpackMasterbar' ) ) {
remove_action( 'customize_register', 'AutomatticJetpackMasterbarregister_css_nudge_control' );
- } else {
- remove_action( 'customize_register', 'AutomatticJetpackDashboard_Customizationsregister_css_nudge_control' );
}
+ // @phan-suppress-next-line PhanUndeclaredClassInCallable
remove_action( 'customize_register', array( 'Jetpack_Custom_CSS_Enhancements', 'customize_register' ) );
}
}
--- a/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php
+++ b/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php
@@ -6,9 +6,11 @@
*/
use AutomatticJetpackConnectionManager;
+use AutomatticJetpackExtensionsPremium_ContentSubscription_ServiceAbstract_Token_Subscription_Service;
use AutomatticJetpackStatusHost;
require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
+require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
/**
* Class WPCOM_REST_API_V2_Endpoint_Email_Preview
@@ -49,10 +51,26 @@
) : array( $this, 'proxy_request_to_wpcom_as_user' ),
'permission_callback' => array( $this, 'permissions_check' ),
'args' => array(
- 'id' => array(
+ 'id' => array(
'description' => __( 'Unique identifier for the post.', 'jetpack' ),
'type' => 'integer',
),
+ 'access' => array(
+ 'description' => __( 'Access level.', 'jetpack' ),
+ 'enum' => array( Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY, Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS, Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS ),
+ 'default' => Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY,
+ 'validate_callback' => function ( $param ) {
+ return in_array(
+ $param,
+ array(
+ Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY,
+ Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_SUBSCRIBERS,
+ Abstract_Token_Subscription_Service::POST_ACCESS_LEVEL_PAID_SUBSCRIBERS,
+ ),
+ true
+ );
+ },
+ ),
),
);
@@ -111,10 +129,20 @@
*/
public function email_preview( $request ) {
$post_id = $request['post_id'];
+ $access = $request['access'];
$post = get_post( $post_id );
return rest_ensure_response(
array(
- 'html' => apply_filters( 'jetpack_generate_email_preview_html', '', $post ),
+ /**
+ * Filters the generated email preview HTML.
+ *
+ * @since 13.8
+ *
+ * @param string $html The generated HTML for the email preview.
+ * @param WP_Post $post The post object.
+ * @param string $access The access level.
+ */
+ 'html' => apply_filters( 'jetpack_generate_email_preview_html', '', $post, $access ),
)
);
}
--- a/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-mailchimp.php
+++ b/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-mailchimp.php
@@ -122,6 +122,16 @@
403
);
}
+
+ // Do not attempt to fetch groups if Mailchimp is not connected.
+ if ( ! $this->is_connected() ) {
+ return new WP_Error(
+ 'mailchimp_not_connected',
+ __( 'Your site is not connected to Mailchimp yet.', 'jetpack' ),
+ 403
+ );
+ }
+
$path = sprintf( '/sites/%d/mailchimp/groups', absint( $site_id ) );
$request = Client::wpcom_json_api_request_as_blog( $path );
$body = wp_remote_retrieve_body( $request );
--- a/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-profile.php
+++ b/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-profile.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * REST API endpoint for user profile.
+ *
+ * @package automattic/jetpack
+ */
+
+/**
+ * Class WPCOM_REST_API_V2_Endpoint_Profile
+ */
+class WPCOM_REST_API_V2_Endpoint_Profile extends WP_REST_Controller {
+ /**
+ * Constructor.
+ */
+ public function __construct() {
+ $this->namespace = 'wpcom/v2';
+ $this->rest_base = 'profile';
+ add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+ }
+
+ /**
+ * Register routes.
+ */
+ public function register_routes() {
+ register_rest_route(
+ $this->namespace,
+ $this->rest_base . '/',
+ array(
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( $this, 'get_item' ),
+ 'permission_callback' => array( $this, 'get_item_permissions_check' ),
+ ),
+ )
+ );
+ }
+
+ /**
+ * Checks if a given request has access to user profile.
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
+ */
+ public function get_item_permissions_check( $request ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+ if ( ! current_user_can( 'read' ) ) {
+ return new WP_Error(
+ 'rest_forbidden',
+ __( 'Sorry, you are not allowed to view your user profile on this site.', 'jetpack' ),
+ array( 'status' => rest_authorization_required_code() )
+ );
+ }
+
+ return true;
+ }
+
+ /**
+ * Retrieves the user profile.
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+ */
+ public function get_item( $request ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+ return rest_ensure_response(
+ array(
+ 'admin_color' => get_user_option( 'admin_color' ),
+ 'locale' => get_user_locale(),
+ )
+ );
+ }
+}
+
+wpcom_rest_api_v2_load_plugin( 'WPCOM_REST_API_V2_Endpoint_Profile' );
--- a/jetpack/_inc/lib/tonesque.php
+++ b/jetpack/_inc/lib/tonesque.php
@@ -38,6 +38,8 @@
* @param string $image_url Image URL.
*/
public function __construct( $image_url ) {
+ _deprecated_function( 'Tonesque::__construct', 'jetpack-13.8' );
+
if ( ! class_exists( 'Jetpack_Color' ) ) {
require_once JETPACK__PLUGIN_DIR . '/_inc/lib/class.color.php';
}
@@ -66,6 +68,8 @@
* @return object|bool Image object or false if the image could not be loaded.
*/
public static function imagecreatefromurl( $image_url ) {
+ _deprecated_function( 'Tonesque::imagecreatefromurl', 'jetpack-13.8' );
+
$data = null;
// If it's a URL.
--- a/jetpack/class.jetpack-admin.php
+++ b/jetpack/class.jetpack-admin.php
@@ -64,6 +64,7 @@
add_action( 'admin_init', array( $jetpack_react, 'react_redirects' ), 0 );
add_action( 'admin_menu', array( $jetpack_react, 'add_actions' ), 998 );
+ add_action( 'admin_menu', array( $jetpack_react, 'remove_jetpack_menu' ), 2000 );
add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_dashboard_sub_nav_item' ) );
add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_settings_sub_nav_item' ) );
add_action( 'jetpack_admin_menu', array( $this, 'admin_menu_debugger' ) );
--- a/jetpack/class.jetpack-gutenberg.php
+++ b/jetpack/class.jetpack-gutenberg.php
@@ -728,7 +728,7 @@
* @module publicize
*
* @since 10.3.0
- * @deprecated $$next_version$$ This is a feature flag that is no longer used.
+ * @deprecated 11.5 This is a feature flag that is no longer used.
*
* @param bool true Enable the RePublicize UI in the block editor context. Defaults to true.
*/
@@ -771,9 +771,9 @@
$initial_state['social']['connectionRefreshPath'] = $social_initial_state['connectionRefreshPath'];
}
- }
- $initial_state['social']['featureFlags'] = $social_initial_state['featureFlags'];
+ $initial_state['social']['featureFlags'] = $social_initial_state['featureFlags'];
+ }
wp_localize_script(
'jetpack-blocks-editor',
--- a/jetpack/class.jetpack.php
+++ b/jetpack/class.jetpack.php
@@ -159,9 +159,6 @@
array( 'grunion-contact-form/grunion-contact-form.php', 'Grunion Contact Form' ),
array( 'mullet/mullet-contact-form.php', 'Mullet Contact Form' ),
),
- 'custom-css' => array(
- array( 'safecss/safecss.php', 'WordPress.com Custom CSS' ),
- ),
'gravatar-hovercards' => array(
array( 'jetpack-gravatar-hovercards/gravatar-hovercards.php', 'Jetpack Gravatar Hovercards' ),
),
--- a/jetpack/extensions/blocks/ai-assistant/ai-assistant.php
+++ b/jetpack/extensions/blocks/ai-assistant/ai-assistant.php
@@ -197,3 +197,15 @@
}
}
);
+
+/**
+ * Register the `ai-title-optimization-keywords-support` extension.
+ */
+add_action(
+ 'jetpack_register_gutenberg_extensions',
+ function () {
+ if ( apply_filters( 'jetpack_ai_enabled', true ) ) {
+ Jetpack_Gutenberg::set_extension_available( 'ai-title-optimization-keywords-support' );
+ }
+ }
+);
--- a/jetpack/extensions/blocks/contact-info/class-jetpack-contact-info-block.php
+++ b/jetpack/extensions/blocks/contact-info/class-jetpack-contact-info-block.php
@@ -22,7 +22,7 @@
* @return string
*/
public static function render( $attr, $content ) {
- Jetpack_Gutenberg::load_styles_as_required( __DIR__ );
+ Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
return str_replace(
'class="wp-block-jetpack-contact-info', // Closing " intentionally ommited to that the user can also add the className as expected.
'itemprop="location" itemscope itemtype="http://schema.org/Organization" class="wp-block-jetpack-contact-info',
--- a/jetpack/extensions/blocks/donations/donations.php
+++ b/jetpack/extensions/blocks/donations/donations.php
@@ -39,6 +39,18 @@
function render_block( $attr, $content ) {
// Keep content as-is if rendered in other contexts than frontend (i.e. feed, emails, API, etc.).
if ( ! jetpack_is_frontend() ) {
+ $parsed = parse_blocks( $content );
+ if ( ! empty( $parsed[0] ) ) {
+ // Inject the link of the current post from the server side as the fallback link to make sure the donations block
+ // points to the correct post when it's inserted from the synced pattern (aka “My Pattern”).
+ $post_link = get_permalink();
+ $parsed[0]['attrs']['fallbackLinkUrl'] = $post_link;
+ $content = render_block( $parsed[0] );
+ if ( preg_match( '/<as+class="jetpack-donations-fallback-link"s+href="([^"]*)"/', $content, $matches ) ) {
+ $content = str_replace( $matches[1], $post_link, $content );
+ }
+ }
+
return $content;
}
--- a/jetpack/extensions/blocks/payment-buttons/payment-buttons.php
+++ b/jetpack/extensions/blocks/payment-buttons/payment-buttons.php
@@ -61,7 +61,7 @@
* @return string
*/
function render_block( $attributes, $content ) {
- Jetpack_Gutenberg::load_styles_as_required( __DIR__ );
+ Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
return $content;
}
--- a/jetpack/extensions/blocks/sharing-button/sharing-button.php
+++ b/jetpack/extensions/blocks/sharing-button/sharing-button.php
@@ -269,12 +269,6 @@
return $hooked_block_types;
}
- $content = $context->content ?? '';
- // Check if the block is already in the template. If so, abort.
- if ( false !== strpos( $content, 'wp:' . PARENT_BLOCK_NAME ) ) {
- return $hooked_block_types;
- }
-
$hooked_block_types[] = PARENT_BLOCK_NAME;
return $hooked_block_types;
}
--- a/jetpack/extensions/blocks/subscriber-login/class-jetpack-subscription-site.php
+++ b/jetpack/extensions/blocks/subscriber-login/class-jetpack-subscription-site.php
@@ -3,7 +3,7 @@
* Adds support for Jetpack Subscription Site feature.
*
* @package automattic/jetpack
- * @since $$next_version$$
+ * @since 13.3
*/
namespace AutomatticJetpackExtensionsSubscriber_Login;
--- a/jetpack/functions.opengraph.php
+++ b/jetpack/functions.opengraph.php
@@ -11,9 +11,15 @@
* @package automattic/jetpack
*/
+use AutomatticJetpackStatusHost;
+
add_action( 'wp_head', 'jetpack_og_tags' );
add_action( 'web_stories_story_head', 'jetpack_og_tags' );
+// Add a Fediverse Open Graph Tag when an author has connected their Mastodon account.
+add_filter( 'jetpack_open_graph_tags', 'jetpack_add_fediverse_creator_open_graph_tag', 10, 1 );
+add_filter( 'jetpack_open_graph_output', 'jetpack_filter_fediverse_cards_output', 10, 1 );
+
/**
* Outputs Open Graph tags generated by Jetpack.
*/
@@ -533,3 +539,120 @@
return $description;
}
+
+/**
+ * Display a Fediverse actor Open Graph tag when the post author has a Mastodon connection.
+ *
+ * @see https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/
+ *
+ * @since 13.8
+ *
+ * @param array $tags Current tags.
+ *
+ * @return array
+ */
+function jetpack_add_fediverse_creator_open_graph_tag( $tags ) {
+ /*
+ * Let's not do this on WordPress.com Simple for now,
+ * because of its performance impact.
+ * See p1723574138779019/1723572983.803009-slack-C01U2KGS2PQ
+ */
+ if ( ( new Host() )->is_wpcom_simple() ) {
+ return $tags;
+ }
+
+ // Let's not add any tags when the ActivityPub plugin already adds its own.
+ $is_activitypub_opengraph_integration_active = get_option( 'activitypub_use_opengraph' );
+ if ( $is_activitypub_opengraph_integration_active ) {
+ return $tags;
+ }
+
+ // We pull the Mastodon connection data from Publicize.
+ if ( ! function_exists( 'publicize_init' ) ) {
+ return $tags;
+ }
+ $publicize = publicize_init();
+
+ global $post;
+ if (
+ ! is_singular()
+ || ! $post instanceof WP_Post
+ || ! isset( $post->ID )
+ || empty( $post->post_author )
+ ) {
+ return $tags;
+ }
+
+ $post_mastodon_connections = array();
+
+ // Loop through active connections.
+ foreach ( (array) $publicize->get_services( 'connected' ) as $service_name => $connections ) {
+ if ( 'mastodon' !== $service_name ) {
+ continue;
+ }
+
+ // services can have multiple connections. Store them all in our array.
+ foreach ( $connections as $connection ) {
+ $connection_id = $publicize->get_connection_id( $connection );
+ $connection_meta = $publicize->get_connection_meta( $connection );
+
+ $connection_data = $connection_meta['connection_data'] ?? array();
+ $mastodon_handle = $connection_meta['external_display'] ?? '';
+ $connection_user_id = $connection_data['user_id'] ?? 0;
+
+ if ( empty( $mastodon_handle ) ) {
+ continue;
+ }
+
+ // Did we skip this connection for this post?
+ if ( get_post_meta( $post->ID, $publicize->POST_SKIP_PUBLICIZE . $connection_id, true ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+ continue;
+ }
+
+ $post_mastodon_connections[] = array(
+ 'user_id' => (int) $connection_user_id,
+ 'connection_id' => (int) $connection_id,
+ 'handle' => $mastodon_handle,
+ 'global' => 0 === (int) $connection_user_id,
+ );
+ }
+ }
+
+ // If we have no Mastodon connections, skip.
+ if ( empty( $post_mastodon_connections ) ) {
+ return $tags;
+ }
+
+ /*
+ * Select a single Mastodon connection to use.
+ * It should be either the first connection belonging to the post author,
+ * or the first global connection.
+ */
+ foreach ( $post_mastodon_connections as $mastodon_connection ) {
+ if ( (int) $post->post_author === $mastodon_connection['user_id'] ) {
+ $tags['fediverse:creator'] = esc_attr( $mastodon_connection['handle'] );
+ break;
+ }
+
+ if ( $mastodon_connection['global'] ) {
+ $tags['fediverse:creator'] = esc_attr( $mastodon_connection['handle'] );
+ break;
+ }
+ }
+
+ return $tags;
+}
+
+/**
+ * Update the markup for the Open Graph tag to match the expected output for Mastodon
+ * (name instead of property).
+ *
+ * @since 13.8
+ *
+ * @param string $og_tag A single OG tag.
+ *
+ * @return string Result of the OG tag.
+ */
+function jetpack_filter_fediverse_cards_output( $og_tag ) {
+ return ( str_contains( $og_tag, 'fediverse:' ) ) ? preg_replace( '/property="([^"]+)"/', 'name="1"', $og_tag ) : $og_tag;
+}
--- a/jetpack/jetpack.php
+++ b/jetpack/jetpack.php
@@ -4,7 +4,7 @@
* Plugin URI: https://jetpack.com
* Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
* Author: Automattic
- * Version: 13.7
+ * Version: 13.8
* Author URI: https://jetpack.com
* License: GPL2+
* Text Domain: jetpack
@@ -34,7 +34,7 @@
define( 'JETPACK__MINIMUM_WP_VERSION', '6.5' );
define( 'JETPACK__MINIMUM_PHP_VERSION', '7.0' );
-define( 'JETPACK__VERSION', '13.7' );
+define( 'JETPACK__VERSION', '13.8' );
/**
* Constant used to fetch the connection owner token
@@ -184,7 +184,7 @@
$message = sprintf(
wp_kses(
/* translators: Placeholder is a link to a support document. */
- __( 'Your installation of Jetpack is incomplete. If you installed Jetpack from GitHub, please refer to <a href="%1$s" target="_blank" rel="noopener noreferrer">this document</a> to set up your development environment. Jetpack must have Composer dependencies installed and built via the build command: <code>jetpack build plugins/jetpack --with-deps</code>', 'jetpack' ),
+ __( 'Your installation of Jetpack is incomplete. If you installed Jetpack from GitHub, please refer to <a href="%1$s" target="_blank" rel="noopener noreferrer">this document</a> to set up your development environment. Jetpack must have Composer dependencies installed and built via the build command: <code>jetpack build plugins/jetpack --deps</code>', 'jetpack' ),
array(
'a' => array(
'href' => array(),
--- a/jetpack/jetpack_vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
*/
class Admin_Menu {
- const PACKAGE_VERSION = '0.4.2';
+ const PACKAGE_VERSION = '0.4.4';
/**
* Whether this class has been initialized
@@ -58,7 +58,7 @@
remove_action( 'admin_menu', array( 'Akismet_Admin', 'admin_menu' ), 5 );
// Add an Anti-spam menu item for Jetpack.
- self::add_menu( __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+ self::add_menu( __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ), 6 );
},
4
);
--- a/jetpack/jetpack_vendor/automattic/jetpack-assets/actions.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-assets/actions.php
@@ -9,6 +9,7 @@
// drop data into `$wp_filter` for `WP_Hook::build_preinitialized_hooks()`.
if ( function_exists( 'add_action' ) ) {
add_action( 'wp_default_scripts', array( AutomatticJetpackAssets::class, 'wp_default_scripts_hook' ) );
+ add_action( 'plugins_loaded', array( AutomatticJetpackAssetsScript_Data::class, 'configure' ), 1 );
} else {
global $wp_filter;
// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
@@ -16,4 +17,9 @@
'accepted_args' => 1,
'function' => array( AutomatticJetpackAssets::class, 'wp_default_scripts_hook' ),
);
+ // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+ $wp_filter['plugins_loaded'][1][] = array(
+ 'accepted_args' => 0,
+ 'function' => array( AutomatticJetpackAssetsScript_Data::class, 'configure' ),
+ );
}
--- a/jetpack/jetpack_vendor/automattic/jetpack-assets/build/i18n-loader.asset.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-assets/build/i18n-loader.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => 'b5d2a25bb8ad1698db1c');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => 'becd7d9884bc1b331e45');
--- a/jetpack/jetpack_vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-assets/build/jetpack-script-data.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => '0274966690f87adbeccb');
--- a/jetpack/jetpack_vendor/automattic/jetpack-assets/src/class-assets.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-assets/src/class-assets.php
@@ -379,7 +379,8 @@
);
$ver = $options['version'] ?? $asset['version'];
} else {
- $ver = $options['version'] ?? filemtime( "$dir/$path" );
+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+ $ver = $options['version'] ?? @filemtime( "$dir/$path" );
}
if ( $options['async'] && '' === $options['strategy'] ) { // Handle the deprecated `async` option
@@ -509,24 +510,31 @@
}
$url = self::normalize_path( plugins_url( $path, __FILE__ ) );
$url = add_query_arg( 'minify', 'true', $url );
- $wp_scripts->add( 'wp-jp-i18n-loader', $url, $asset['dependencies'], $asset['version'] );
+
+ $handle = 'wp-jp-i18n-loader';
+
+ $wp_scripts->add( $handle, $url, $asset['dependencies'], $asset['version'] );
+
+ // Ensure the script is loaded in the footer and deferred.
+ $wp_scripts->add_data( $handle, 'group', 1 );
+
if ( ! is_array( $data ) ||
! isset( $data['baseUrl'] ) || ! ( is_string( $data['baseUrl'] ) || false === $data['baseUrl'] ) ||
! isset( $data['locale'] ) || ! is_string( $data['locale'] ) ||
! isset( $data['domainMap'] ) || ! is_array( $data['domainMap'] ) ||
! isset( $data['domainPaths'] ) || ! is_array( $data['domainPaths'] )
) {
- $wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'console.warn( "I18n state deleted by jetpack_i18n_state hook" );' );
+ $wp_scripts->add_inline_script( $handle, 'console.warn( "I18n state deleted by jetpack_i18n_state hook" );' );
} elseif ( ! $data['baseUrl'] ) {
- $wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'console.warn( "Failed to determine languages base URL. Is WP_LANG_DIR in the WordPress root?" );' );
+ $wp_scripts->add_inline_script( $handle, 'console.warn( "Failed to determine languages base URL. Is WP_LANG_DIR in the WordPress root?" );' );
} else {
$data['domainMap'] = (object) $data['domainMap']; // Ensure it becomes a json object.
$data['domainPaths'] = (object) $data['domainPaths']; // Ensure it becomes a json object.
- $wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'wp.jpI18nLoader.state = ' . wp_json_encode( $data, JSON_UNESCAPED_SLASHES ) . ';' );
+ $wp_scripts->add_inline_script( $handle, 'wp.jpI18nLoader.state = ' . wp_json_encode( $data, JSON_UNESCAPED_SLASHES ) . ';' );
}
// Deprecated state module: Depend on wp-i18n to ensure global `wp` exists and because anything needing this will need that too.
- $wp_scripts->add( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) );
+ $wp_scripts->add( 'wp-jp-i18n-state', false, array( 'wp-deprecated', $handle ) );
$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' );
$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' );
@@ -534,6 +542,7 @@
// @todo Remove this when we drop support for WordPress 6.5, as well as the script inclusion in test_wp_default_scripts_hook.
$jsx_url = self::normalize_path( plugins_url( '../build/react-jsx-runtime.js', __FILE__ ) );
$wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true );
+ $wp_scripts->add_data( 'react-jsx-runtime', 'group', 1 );
}
// endregion .
--- a/jetpack/jetpack_vendor/automattic/jetpack-assets/src/class-script-data.php
+++ b/jetpack/jetpack_vendor/automattic/jetpack-assets/src/class-script-data.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Jetpack script data.
+ *
+ * @package automattic/jetpack-assets
+ */
+
+namespace AutomatticJetpackAssets;
+
+use AutomatticJetpackAssets;
+
+/**
+ * Class script data
+ */
+class Script_Data {
+
+ const SCRIPT_HANDLE = 'jetpack-script-data';
+
+ /**
+ * Configure.
+ */
+ public static function configure() {
+ /**
+ * Ensure that assets are registered on wp_loaded,
+ * which is fired before *_enqueue_scripts actions.
+ * It means that when the dependent scripts are registered,
+ * the scripts here are already registered.
+ */
+ add_action( 'wp_loaded', array( self::class, 'register_assets' ) );
+
+ /**
+ * Notes:
+ * 1. wp_print_scripts action is fired on both admin and public pages.
+ * On admin pages, it's fired before admin_enqueue_scripts action,
+ * which can be a problem if the consumer package uses admin_enqueue_scripts
+ * to hook into the script data. Thus, we prefer to use admin_print_scripts on admin pages.
+ * 2. We want to render the script data on print, instead of init or enqueue actions,
+ * so that the hook callbacks have enough time and information
+ * to decide whether to update the script data or not.
+ */
+