React compatibility: Changing global JSX namespace to React.JSX (#38585)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10157890644 Upstream-Ref: Automattic/jetpack@b50a15c
Automattic · Jul 30, 2024 · 60c9da1 · 60c9da1
1 parent 26e41ae
commit 60c9da1
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 89 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
@@ -13,6 +13,7 @@ This is an alpha version! The changes listed here are not final.
 - Admin bar: Force mobile viewport to have the same icon color as desktop
 - Blog Privacy: Update Applebot-Extended disallow rule
 - Hide the plugin banner on non-wpcom-connected users or agency-managed users
+- React: Changing global JSX namespace to React.JSX
 
 ### Fixed
 - Admin Bar: Fix the order of the top-right items on Atomic sites

diff --git a/...-mu-wpcom/src/build/wpcom-block-description-links/wpcom-block-description-links.asset.php b/...-mu-wpcom/src/build/wpcom-block-description-links/wpcom-block-description-links.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-url'), 'version' => 'b515758ac27e45334920');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-url'), 'version' => 'f218072b4f6c868afcae');
diff --git a/...jetpack-mu-wpcom/src/build/wpcom-block-description-links/wpcom-block-description-links.js b/...jetpack-mu-wpcom/src/build/wpcom-block-description-links/wpcom-block-description-links.js
diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-block-description-links/index.tsx b/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-block-description-links/index.tsx
@@ -2,6 +2,7 @@ import { localizeUrl } from '@automattic/i18n-utils';
 import { createInterpolateElement } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
 import { JSXElementConstructor, ReactElement } from 'react';
+import React from 'react';
 import blockInfoMapping, {
 	blockInfoWithVariations,
 	childrenBlockInfoWithDifferentUrl,

diff --git a/...c/jetpack-mu-wpcom/src/features/wpcom-block-description-links/src/inline-support-link.tsx b/...c/jetpack-mu-wpcom/src/features/wpcom-block-description-links/src/inline-support-link.tsx
@@ -3,6 +3,7 @@ import { useAnalytics } from '@automattic/jetpack-shared-extension-utils';
 import { Button, ExternalLink } from '@wordpress/components';
 import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
+import React from 'react';
 import { useState, JSXElementConstructor, ReactElement } from 'react';
 
 interface Props {
@@ -27,7 +28,7 @@ export default function DescriptionSupportLink( {
 	title,
 	url,
 	postId,
-}: Props ): JSX.Element {
+}: Props ): React.JSX.Element {
 	// This was cooked up to only apply the link in the BlockEditor sidebar.
 	// Since there was no identifier in the environment to differentiate.
 	const [ ref, setRef ] = useState< Element | null >();
@@ -37,7 +38,7 @@ export default function DescriptionSupportLink( {
 	const setShowSupportDoc = helpCenterDispatch?.setShowSupportDoc;
 
 	if ( ref && ! ref?.closest( '.block-editor-block-inspector' ) ) {
-		return children as JSX.Element;
+		return children as React.JSX.Element;
 	}
 
 	return (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-url'), 'version' => 'b515758ac27e45334920');
		<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-url'), 'version' => 'f218072b4f6c868afcae');