Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add deprecated call to wp.components.ServerSideRender; Remove some missed wp.components.ServerSideRender usages. #16133

Merged
merged 2 commits into from
Aug 12, 2019
Merged

Add deprecated call to wp.components.ServerSideRender; Remove some missed wp.components.ServerSideRender usages. #16133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1926ec7
Add deprecated call to wp.components.ServerSideRender
jorgefilipecosta Jun 12, 2019
aa092c9
Add deprecated call to wp.components.ServerSideRender
jorgefilipecosta Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,21 +275,6 @@ function gutenberg_register_scripts_and_styles() {
)
);

// Add back compatibility for calls to wp.components.ServerSideRender.
wp_add_inline_script(
'wp-server-side-render',
implode(
"\n",
array(
'( function() {',
' if ( wp && wp.components && wp.serverSideRender && ! wp.components.ServerSideRender ) {',
' wp.components.ServerSideRender = wp.serverSideRender;',
' };',
'} )();',
)
)
);

// Editor Styles.
// This empty stylesheet is defined to ensure backward compatibility.
gutenberg_override_style( 'wp-blocks', false );
Expand Down
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/server-side-render/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"@wordpress/api-fetch": "file:../api-fetch",
"@wordpress/components": "file:../components",
"@wordpress/data": "file:../data",
"@wordpress/deprecated": "file:../deprecated",
"@wordpress/element": "file:../element",
"@wordpress/i18n": "file:../i18n",
"@wordpress/url": "file:../url",
Expand Down
18 changes: 16 additions & 2 deletions packages/server-side-render/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/**
* WordPress dependencies
*/
import { useMemo } from '@wordpress/element';
import { useMemo, forwardRef } from '@wordpress/element';
import { withSelect } from '@wordpress/data';
import deprecated from '@wordpress/deprecated';

/**
* Internal dependencies
Expand All @@ -14,7 +15,7 @@ import ServerSideRender from './server-side-render';
*/
const EMPTY_OBJECT = {};

export default withSelect(
const ExportedServerSideRender = withSelect(
( select ) => {
const coreEditorSelect = select( 'core/editor' );
if ( coreEditorSelect ) {
Expand Down Expand Up @@ -44,3 +45,16 @@ export default withSelect(
);
}
);

if ( window && window.wp && window.wp.components ) {
window.wp.components.ServerSideRender = forwardRef( ( props, ref ) => {
deprecated( 'wp.components.ServerSideRender', {
alternative: 'wp.serverSideRender',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit unfortunate that this global variable starts with lowercase.

} );
return (
<ExportedServerSideRender { ...props } ref={ ref } />
);
} );
}

export default ExportedServerSideRender;