Merge branch 'master' into update/lazy-images-assets-package-dependency

* master:
  External Media: Handle space errors on upload (#17014)
  Autoloader: Support unoptimized PSR-4 (#16819)
  Donations / Payments: Use getSiteFragment for building Calypso links (#17042)
  Site Scan & AMP: Include toolbar scripts for Site Scan have data-ampdevmode on AMP requests (#17034)
  Update optin comment to correct default value of true. (#17048)
  Plugins: avoid including network-activated plugins in responses (#17044)
  Instant Search: Fix photon integration (#17037)

.gitignore

@@ -69,6 +69,7 @@ _inc/jetpack-strings.php
 /vendor/class-autoloader-handler.php
 /vendor/class-classes-handler.php
 /vendor/class-files-handler.php
+/vendor/class-manifest-handler.php
 /vendor/class-plugins-handler.php
 /vendor/class-version-selector.php
 /vendor/jetpack-autoloader

class.jetpack.php

@@ -6261,8 +6261,8 @@ public static function sync_idc_optin() {
 		}
 
 		/**
-		 * Allows sites to opt in to IDC mitigation which blocks the site from syncing to WordPress.com when the home
-		 * URL or site URL do not match what WordPress.com expects. The default value is either false, or the value of
+		 * Allows sites to opt in for IDC mitigation which blocks the site from syncing to WordPress.com when the home
+		 * URL or site URL do not match what WordPress.com expects. The default value is either true, or the value of
 		 * JETPACK_SYNC_IDC_OPTIN constant if set.
 		 *
 		 * @since 4.3.2

extensions/blocks/donations/controls.js

@@ -25,9 +25,10 @@ import { DOWN } from '@wordpress/keycodes';
  * Internal dependencies
  */
 import { SUPPORTED_CURRENCIES } from '../../shared/currencies';
+import getSiteFragment from '../../shared/get-site-fragment';
 
 const Controls = props => {
-	const { attributes, setAttributes, siteSlug } = props;
+	const { attributes, setAttributes } = props;
 	const { currency, monthlyDonation, annualDonation, showCustomAmount } = attributes;
 
 	const toggleDonation = ( interval, show ) => {
@@ -112,7 +113,7 @@ const Controls = props => {
 						onChange={ value => setAttributes( { showCustomAmount: value } ) }
 						label={ __( 'Show custom amount option', 'jetpack' ) }
 					/>
-					<ExternalLink href={ `https://wordpress.com/earn/payments/${ siteSlug }` }>
+					<ExternalLink href={ `https://wordpress.com/earn/payments/${ getSiteFragment() }` }>
 						{ __( 'View donation earnings', 'jetpack' ) }
 					</ExternalLink>
 				</PanelBody>

extensions/blocks/donations/edit.js

@@ -20,7 +20,6 @@ const Edit = props => {
 	const [ shouldUpgrade, setShouldUpgrade ] = useState( false );
 	const [ stripeConnectUrl, setStripeConnectUrl ] = useState( false );
 	const [ products, setProducts ] = useState( [] );
-	const [ siteSlug, setSiteSlug ] = useState( '' );
 
 	const apiError = message => {
 		setLoadingError( message );
@@ -51,7 +50,6 @@ const Edit = props => {
 		}
 		setShouldUpgrade( result.should_upgrade_to_access_memberships );
 		setStripeConnectUrl( result.connect_url );
-		setSiteSlug( result.site_slug );
 
 		const filteredProducts = filterProducts( result.products );
 
@@ -91,7 +89,6 @@ const Edit = props => {
 			{ ...props }
 			products={ products }
 			shouldUpgrade={ shouldUpgrade }
-			siteSlug={ siteSlug }
 			stripeConnectUrl={ stripeConnectUrl }
 		/>
 	);

extensions/blocks/recurring-payments/edit.jsx

@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import apiFetch from '@wordpress/api-fetch';
 import { __, sprintf } from '@wordpress/i18n';
 import formatCurrency from '@automattic/format-currency';
-import { addQueryArgs, getQueryArg, isURL } from '@wordpress/url';
 import { compose } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
 import {
@@ -28,6 +27,7 @@ import { applyFilters } from '@wordpress/hooks';
 import getJetpackExtensionAvailability from '../../shared/get-jetpack-extension-availability';
 import StripeNudge from '../../shared/components/stripe-nudge';
 import { minimumTransactionAmountForCurrency } from '../../shared/currencies';
+import getSiteFragment from '../../shared/get-site-fragment';
 import { icon, isPriceValid, removeInvalidProducts, CURRENCY_OPTIONS } from '.';
 
 const API_STATE_LOADING = 0;
@@ -63,7 +63,6 @@ class MembershipsButtonEdit extends Component {
 			shouldUpgrade: false,
 			upgradeURL: '',
 			products: [],
-			siteSlug: '',
 			editedProductCurrency: 'USD',
 			editedProductPrice: formatPriceForNumberInputValue(
 				minimumTransactionAmountForCurrency( 'USD' ),
@@ -112,7 +111,6 @@ class MembershipsButtonEdit extends Component {
 					products,
 					should_upgrade_to_access_memberships: shouldUpgrade,
 					upgrade_url: upgradeURL,
-					site_slug: siteSlug,
 				} = result;
 				const connected = result.connected_account_id
 					? API_STATE_CONNECTED
@@ -122,7 +120,6 @@ class MembershipsButtonEdit extends Component {
 					connectURL,
 					shouldUpgrade,
 					upgradeURL,
-					siteSlug,
 					products: removeInvalidProducts( products ),
 				} );
 			},
@@ -415,7 +412,7 @@ class MembershipsButtonEdit extends Component {
 					/>
 				</PanelBody>
 				<PanelBody title={ __( 'Management', 'jetpack' ) }>
-					<ExternalLink href={ `https://wordpress.com/earn/payments/${ this.state.siteSlug }` }>
+					<ExternalLink href={ `https://wordpress.com/earn/payments/${ getSiteFragment() }` }>
 						{ __( 'See your earnings, subscriber list, and payment plans.', 'jetpack' ) }
 					</ExternalLink>
 				</PanelBody>

extensions/shared/external-media/sources/with-media.js

@@ -127,6 +127,14 @@ export default function withMedia() {
 					return;
 				}
 
+				// Normalize upload errors.
+				if ( error.errors?.length ) {
+					error = {
+						code: error.errors[ 0 ].error,
+						message: error.errors[ 0 ].message,
+					};
+				}
+
 				const { noticeOperations } = this.props;
 
 				noticeOperations.createErrorNotice(

json-endpoints/jetpack/class.jetpack-json-api-plugins-endpoint.php

@@ -152,6 +152,10 @@ protected function format_plugin( $plugin_file, $plugin_data ) {
 
 		$plugin['uninstallable']   = is_uninstallable_plugin( $plugin_file );
 
+		if ( is_multisite() ) {
+			$plugin['network_active'] = is_plugin_active_for_network( $plugin_file );
+		}
+
 		if ( ! empty ( $this->log[ $plugin_file ] ) ) {
 			$plugin['log'] = $this->log[ $plugin_file ];
 		}
@@ -183,6 +187,10 @@ protected function format_plugin_v1_2( $plugin_file, $plugin_data ) {
 		$plugin['autoupdate_translation'] = $autoupdate || $autoupdate_translation || Jetpack_Options::get_option( 'autoupdate_translations', false );
 		$plugin['uninstallable']   = is_uninstallable_plugin( $plugin_file );
 
+		if ( is_multisite() ) {
+			$plugin['network_active'] = is_plugin_active_for_network( $plugin_file );
+		}
+
 		if ( ! empty ( $this->log[ $plugin_file ] ) ) {
 			$plugin['log'] = $this->log[ $plugin_file ];
 		}
@@ -248,10 +256,27 @@ protected function get_plugins() {
 		$plugins = array();
 		/** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
 		$installed_plugins = apply_filters( 'all_plugins', get_plugins() );
-		foreach( $this->plugins as $plugin ) {
-			if ( ! isset( $installed_plugins[ $plugin ] ) )
+		foreach ( $this->plugins as $plugin ) {
+			if ( ! isset( $installed_plugins[ $plugin ] ) ) {
 				continue;
-			$plugins[] = $this->format_plugin( $plugin, $installed_plugins[ $plugin ] );
+			}
+
+			$formatted_plugin = $this->format_plugin( $plugin, $installed_plugins[ $plugin ] );
+
+			/*
+			 * Do not show network-active plugins
+			 * to folks who do not have the permission to see them.
+			 */
+			if (
+				/** This filter is documented in src/wp-admin/includes/class-wp-plugins-list-table.php */
+				! apply_filters( 'show_network_active_plugins', current_user_can( 'manage_network_plugins' ) )
+				&& ! empty( $formatted_plugin['network_active'] )
+				&& true === $formatted_plugin['network_active']
+			) {
+				continue;
+			}
+
+			$plugins[] = $formatted_plugin;
 		}
 		$args = $this->query_args();
 

modules/scan/class-admin-bar-notice.php

@@ -52,6 +52,15 @@ private function init_hooks() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_toolbar_script' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_toolbar_script' ) );
 		add_action( 'admin_bar_menu', array( $this, 'add_threats_to_toolbar' ), 999 );
+
+		// Inject the data-ampdevmode attribute into the inline <script> output via wp_localize_script(). To revisit after https://github.com/ampproject/amp-wp/issues/4598.
+		add_filter(
+			'amp_dev_mode_element_xpaths',
+			static function ( $expressions ) {
+				$expressions[] = '//script[ contains( text(), "Jetpack_Scan" ) ]';
+				return $expressions;
+			}
+		);
 	}
 
 	/**
@@ -90,7 +99,7 @@ public function enqueue_toolbar_script() {
 		}
 
 		// We don't know about threats in the cache lets load the JS that fetches the info and updates the admin bar.
-		Assets::enqueue_async_script( self::SCRIPT_NAME, '_inc/build/scan/admin-bar-notice.min.js', 'modules/scan/admin-bar-notice.js', array(), self::SCRIPT_VERSION, true );
+		Assets::enqueue_async_script( self::SCRIPT_NAME, '_inc/build/scan/admin-bar-notice.min.js', 'modules/scan/admin-bar-notice.js', array( 'admin-bar' ), self::SCRIPT_VERSION, true );
 
 		$script_data = array(
 			'nonce'              => wp_create_nonce( 'wp_rest' ),

modules/search/instant-search/components/photon-image.jsx

@@ -6,13 +6,29 @@
 import { h } from 'preact';
 import photon from 'photon';
 
+/**
+ * Strips query string values from URLs; photon can't handle them.
+ *
+ * @param {string} url - Image URL
+ *
+ * @returns {string} - Image URL without any query strings.
+ */
+function stripQueryString( url ) {
+	return url.split( '?', 1 )[ 0 ];
+}
+
 const PhotonImage = ( { useDiv, src, maxWidth = 300, maxHeight = 300, alt, ...otherProps } ) => {
-	const photonSrc = photon( src, { resize: `${ maxWidth },${ maxHeight }` } );
+	const photonSrc = photon( stripQueryString( src ), { resize: `${ maxWidth },${ maxHeight }` } );
+	const srcToDisplay = photonSrc !== null ? photonSrc : src;
 
 	return useDiv ? (
-		<div style={ { backgroundImage: `url("${ src }")` } } title={ alt } { ...otherProps } />
+		<div
+			style={ { backgroundImage: `url("${ srcToDisplay }")` } }
+			title={ alt }
+			{ ...otherProps }
+		/>
 	) : (
-		<img src={ photonSrc !== null ? photonSrc : src } alt={ alt } { ...otherProps } />
+		<img src={ srcToDisplay } alt={ alt } { ...otherProps } />
 	);
 };
 

packages/autoloader/composer.json

@@ -10,6 +10,9 @@
 		"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5"
 	},
 	"autoload": {
+		"classmap": [
+			"src/AutoloadGenerator.php"
+		],
 		"psr-4": {
 			"Automattic\\Jetpack\\Autoloader\\": "src"
 		}

packages/autoloader/phpunit.xml.dist

@@ -1,7 +1,7 @@
 <phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="true" colors="true">
 	<testsuites>
 		<testsuite name="main">
-			<directory prefix="test" suffix=".php">tests/php</directory>
+			<directory prefix="test" suffix=".php">tests/php/tests</directory>
 		</testsuite>
 	</testsuites>
 	<filter>