General: remove WP 6.1 backwards compatibility checks

See #31638 This mostly removes checks that were added in #28710
Automattic · Aug 30, 2023 · 84b9188 · 84b9188
1 parent d7f7861
commit 84b9188
Show file tree

Hide file tree

Showing 32 changed files with 127 additions and 166 deletions.
diff --git a/projects/packages/backup/changelog/update-wp-61-backcompat-janitorial b/projects/packages/backup/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/backup/src/js/index.js b/projects/packages/backup/src/js/index.js
@@ -1,6 +1,6 @@
 import { ThemeProvider } from '@automattic/jetpack-components';
 import { createReduxStore, register } from '@wordpress/data';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 import Admin from './components/Admin';
 import { STORE_ID, storeConfig } from './store';
@@ -11,24 +11,19 @@ register( store );
 /**
  * Initial render function.
  */
-function render() {
+function renderDash() {
 	const container = document.getElementById( 'jetpack-backup-root' );
 
 	if ( null === container ) {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	const component = (
+	render(
 		<ThemeProvider>
 			<Admin />
-		</ThemeProvider>
+		</ThemeProvider>,
+		container
 	);
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( component );
-	} else {
-		WPElement.render( component, container );
-	}
 }
 
-render();
+renderDash();
diff --git a/projects/packages/connection/changelog/update-wp-61-backcompat-janitorial b/projects/packages/connection/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/connection/tests/php/bootstrap.php b/projects/packages/connection/tests/php/bootstrap.php
@@ -10,10 +10,6 @@
  */
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-// Disable warning about deprecated request library.
-// @todo Remove this once we drop support for WordPress 6.1
-define( 'REQUESTS_SILENCE_PSR0_DEPRECATIONS', true );
-
 // Work around WordPress bug when `@runInSeparateProcess` is used.
 if ( empty( $_SERVER['SCRIPT_FILENAME'] ) ) {
 	$_SERVER['SCRIPT_FILENAME'] = __DIR__ . '/vendor/phpunit/phpunit/phpunit';

diff --git a/projects/packages/identity-crisis/changelog/update-wp-61-backcompat-janitorial b/projects/packages/identity-crisis/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/identity-crisis/src/_inc/admin.jsx b/projects/packages/identity-crisis/src/_inc/admin.jsx
@@ -1,5 +1,5 @@
 import { IDCScreen } from '@automattic/jetpack-idc';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 
 import './admin-bar.scss';
@@ -8,7 +8,7 @@ import './style.scss';
 /**
  * The initial renderer function.
  */
-function render() {
+function renderIdc() {
 	if ( ! window.hasOwnProperty( 'JP_IDENTITY_CRISIS__INITIAL_STATE' ) ) {
 		return;
 	}
@@ -36,7 +36,6 @@ function render() {
 	} = window.JP_IDENTITY_CRISIS__INITIAL_STATE;
 
 	if ( ! isSafeModeConfirmed ) {
-		// @todo: Remove fallback when we drop support for WP 6.1
 		const component = (
 			<IDCScreen
 				wpcomHomeUrl={ wpcomHomeUrl }
@@ -54,13 +53,8 @@ function render() {
 				possibleDynamicSiteUrlDetected={ possibleDynamicSiteUrlDetected }
 			/>
 		);
-
-		if ( WPElement.createRoot ) {
-			WPElement.createRoot( container ).render( component );
-		} else {
-			WPElement.render( component, container );
-		}
+		render( component, container );
 	}
 }
 
-window.addEventListener( 'load', () => render() );
+window.addEventListener( 'load', () => renderIdc() );
diff --git a/projects/packages/my-jetpack/_inc/admin.jsx b/projects/packages/my-jetpack/_inc/admin.jsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { ThemeProvider } from '@automattic/jetpack-components';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React, { useEffect } from 'react';
 import { HashRouter, Navigate, Routes, Route, useLocation } from 'react-router-dom';
 /**
@@ -74,18 +74,13 @@ const MyJetpack = () => (
 /**
  * The initial renderer function.
  */
-function render() {
+function renderMyJetpack() {
 	const container = document.getElementById( 'my-jetpack-container' );
 	if ( null === container ) {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( <MyJetpack /> );
-	} else {
-		WPElement.render( <MyJetpack />, container );
-	}
+	render( <MyJetpack />, container );
 }
 
-render();
+renderMyJetpack();
diff --git a/projects/packages/my-jetpack/changelog/update-wp-61-backcompat-janitorial b/projects/packages/my-jetpack/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/search/changelog/update-wp-61-backcompat-janitorial b/projects/packages/search/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/search/src/dashboard/index.jsx b/projects/packages/search/src/dashboard/index.jsx
@@ -1,5 +1,5 @@
 import { createReduxStore, register } from '@wordpress/data';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 import SearchDashboard from './components/dashboard/wrapped-dashboard';
 import { STORE_ID, storeConfig } from './store';
@@ -17,12 +17,7 @@ function init() {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( <SearchDashboard /> );
-	} else {
-		WPElement.render( <SearchDashboard />, container );
-	}
+	render( <SearchDashboard />, container );
 }
 
 // Initialize the dashboard when DOMContentLoaded is fired, or immediately if it already has been.

diff --git a/projects/packages/videopress/changelog/update-wp-61-backcompat-janitorial b/projects/packages/videopress/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/videopress/src/client/admin/index.js b/projects/packages/videopress/src/client/admin/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { ThemeProvider } from '@automattic/jetpack-components';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { useEffect } from 'react';
 import { HashRouter, Switch, Route, useLocation } from 'react-router-dom';
@@ -66,19 +66,14 @@ const VideoPress = () => {
 /**
  * Initial render function.
  */
-function render() {
+function renderVideopress() {
 	const container = document.getElementById( 'jetpack-videopress-root' );
 
 	if ( null === container ) {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( <VideoPress /> );
-	} else {
-		WPElement.render( <VideoPress />, container );
-	}
+	render( <VideoPress />, container );
 }
 
-render();
+renderVideopress();
diff --git a/projects/packages/wordads/changelog/update-wp-61-backcompat-janitorial b/projects/packages/wordads/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/packages/wordads/src/dashboard/index.jsx b/projects/packages/wordads/src/dashboard/index.jsx
@@ -1,6 +1,6 @@
 import { ThemeProvider } from '@automattic/jetpack-components';
 import { createReduxStore, register } from '@wordpress/data';
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 import WordAdsDashboard from './components/dashboard';
 import { STORE_ID, storeConfig } from './store';
@@ -18,17 +18,12 @@ function init() {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	const component = (
+	render(
 		<ThemeProvider>
 			<WordAdsDashboard />
-		</ThemeProvider>
+		</ThemeProvider>,
+		container
 	);
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( component );
-	} else {
-		WPElement.render( component, container );
-	}
 }
 
 // Initialize the dashboard when DOMContentLoaded is fired, or immediately if it already has been.

diff --git a/projects/plugins/boost/app/assets/src/js/elements/ReactComponent.svelte b/projects/plugins/boost/app/assets/src/js/elements/ReactComponent.svelte
@@ -7,16 +7,11 @@
 	let root;
 	afterUpdate( () => {
 		const { this: component, children, ...props } = $$props;
-		// @todo: Remove fallback when we drop support for WP 6.1
-		if ( WPElement.createRoot ) {
-			root = WPElement.createRoot( container );
-		} else {
-			const theContainer = container;
-			root = {
-				render: theComponent => WPElement.render( theComponent, theContainer ),
-				unmount: () => WPElement.unmountComponentAtNode( theContainer ),
-			};
-		}
+		const theContainer = container;
+		root = {
+			render: theComponent => WPElement.render( theComponent, theContainer ),
+			unmount: () => WPElement.unmountComponentAtNode( theContainer ),
+		};
 		root.render( React.createElement( component, props, children ) );
 	} );
 	onDestroy( () => {

diff --git a/projects/plugins/boost/changelog/update-wp-61-backcompat-janitorial b/projects/plugins/boost/changelog/update-wp-61-backcompat-janitorial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: remove WP 6.1 backwards compatibility checks
diff --git a/projects/plugins/jetpack/_inc/client/activation-modal-entry.js b/projects/plugins/jetpack/_inc/client/activation-modal-entry.js
@@ -1,4 +1,4 @@
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 import { Provider } from 'react-redux';
 import store from 'state/redux-store-minimal';
@@ -10,17 +10,12 @@ import ActivationModal from './portals/activation-modal';
 function initActivationModalApp() {
 	const container = document.getElementById( 'jetpack-plugin-portal-app' );
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	const component = (
+	render(
 		<Provider store={ store }>
 			<ActivationModal />
-		</Provider>
+		</Provider>,
+		container
 	);
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( component );
-	} else {
-		WPElement.render( component, container );
-	}
 }
 
 if ( document.readyState !== 'loading' ) {

diff --git a/projects/plugins/jetpack/_inc/client/admin.js b/projects/plugins/jetpack/_inc/client/admin.js
@@ -1,4 +1,4 @@
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import { _x } from '@wordpress/i18n';
 import accessibleFocus from 'lib/accessible-focus';
 import { assign } from 'lodash';
@@ -20,19 +20,18 @@ if ( 'undefined' !== typeof window && process.env.NODE_ENV === 'development' ) {
 	} );
 }
 
-render();
+renderApp();
 
 /**
- *
+ * Initial render function.
  */
-function render() {
+function renderApp() {
 	const container = document.getElementById( 'jp-plugin-container' );
 
 	if ( container === null ) {
 		return;
 	}
 
-	// @todo: Remove fallback when we drop support for WP 6.1
 	const component = (
 		<div>
 			<Provider store={ store }>
@@ -100,11 +99,7 @@ function render() {
 			</Provider>
 		</div>
 	);
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( component );
-	} else {
-		WPElement.render( component, container );
-	}
+	render( component, container );
 }
 
 /**

diff --git a/projects/plugins/jetpack/_inc/client/components/root-child/index.jsx b/projects/plugins/jetpack/_inc/client/components/root-child/index.jsx
@@ -19,16 +19,11 @@ export default class RootChild extends React.Component {
 	componentDidMount() {
 		this.container = document.createElement( 'div' );
 		document.body.appendChild( this.container );
-		// @todo: Remove fallback when we drop support for WP 6.1
-		if ( WPElement.createRoot ) {
-			this.containerRoot = WPElement.createRoot( this.container );
-		} else {
-			const theContainer = this.container;
-			this.containerRoot = {
-				render: component => WPElement.render( component, theContainer ),
-				unmount: () => WPElement.unmountComponentAtNode( theContainer ),
-			};
-		}
+		const theContainer = this.container;
+		this.containerRoot = {
+			render: component => WPElement.render( component, theContainer ),
+			unmount: () => WPElement.unmountComponentAtNode( theContainer ),
+		};
 		this.renderChildren();
 	}
 

diff --git a/projects/plugins/jetpack/_inc/client/plugins-entry.js b/projects/plugins/jetpack/_inc/client/plugins-entry.js
@@ -1,4 +1,4 @@
-import * as WPElement from '@wordpress/element';
+import { render } from '@wordpress/element';
 import React from 'react';
 import { Provider } from 'react-redux';
 import store from 'state/redux-store-minimal';
@@ -10,17 +10,12 @@ import PluginDeactivation from './portals/plugin-deactivation';
 function initPluginsPageApp() {
 	const container = document.getElementById( 'jetpack-plugin-portal-app' );
 
-	// @todo: Remove fallback when we drop support for WP 6.1
-	const component = (
+	render(
 		<Provider store={ store }>
 			<PluginDeactivation />
-		</Provider>
+		</Provider>,
+		container
 	);
-	if ( WPElement.createRoot ) {
-		WPElement.createRoot( container ).render( component );
-	} else {
-		WPElement.render( component, container );
-	}
 }
 
 if ( document.readyState !== 'loading' ) {