Editor: Move the Excerpt panel to the editor package

packages/edit-post/src/components/sidebar/settings-sidebar/index.js

@@ -13,6 +13,7 @@ import { store as interfaceStore } from '@wordpress/interface';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 import {
 	store as editorStore,
+	PostExcerptPanel,
 	PostFeaturedImagePanel,
 	PostLastRevisionPanel,
 	PostTaxonomiesPanel,
@@ -23,7 +24,6 @@ import {
  */
 import SettingsHeader from '../settings-header';
 import PostStatus from '../post-status';
-import PostExcerpt from '../post-excerpt';
 import DiscussionPanel from '../discussion-panel';
 import PageAttributes from '../page-attributes';
 import MetaBoxes from '../../meta-boxes';
@@ -84,7 +84,7 @@ const SidebarContent = ( {
 							<PostLastRevisionPanel />
 							<PostTaxonomiesPanel />
 							<PostFeaturedImagePanel />
-							<PostExcerpt />
+							<PostExcerptPanel />
 							<DiscussionPanel />
 							<PageAttributes />
 							<MetaBoxes location="side" />

packages/edit-post/src/index.js

@@ -15,7 +15,10 @@ import {
 	registerLegacyWidgetBlock,
 	registerWidgetGroupBlock,
 } from '@wordpress/widgets';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	privateApis as editorPrivateApis,
+	store as editorStore,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -24,6 +27,10 @@ import './hooks';
 import './plugins';
 import Editor from './editor';
 import { store as editPostStore } from './store';
+import { unlock } from './lock-unlock';
+
+const { PluginPostExcerpt: __experimentalPluginPostExcerpt } =
+	unlock( editorPrivateApis );
 
 /**
  * Initializes and returns an instance of Editor.
@@ -208,5 +215,5 @@ export { default as PluginSidebar } from './components/sidebar/plugin-sidebar';
 export { default as PluginSidebarMoreMenuItem } from './components/header/plugin-sidebar-more-menu-item';
 export { default as __experimentalFullscreenModeClose } from './components/header/fullscreen-mode-close';
 export { default as __experimentalMainDashboardButton } from './components/header/main-dashboard-button';
-export { default as __experimentalPluginPostExcerpt } from './components/sidebar/plugin-post-excerpt';
+export { __experimentalPluginPostExcerpt };
 export { store } from './store';

packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js

@@ -13,6 +13,7 @@ import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
 import {
+	PostExcerptPanel,
 	PostFeaturedImagePanel,
 	PostLastRevisionPanel,
 	PostTaxonomiesPanel,
@@ -102,6 +103,7 @@ export default function PagePanels() {
 			<PostLastRevisionPanel />
 			<PostTaxonomiesPanel />
 			<PostFeaturedImagePanel />
+			<PostExcerptPanel />
 		</>
 	);
 }

packages/edit-site/src/components/sidebar-edit-mode/template-panel/index.js

@@ -4,6 +4,7 @@
 import { useSelect } from '@wordpress/data';
 import { PanelBody } from '@wordpress/components';
 import {
+	PostExcerptPanel,
 	PostFeaturedImagePanel,
 	PostLastRevisionPanel,
 	PostTaxonomiesPanel,
@@ -66,6 +67,7 @@ export default function TemplatePanel() {
 			<PostLastRevisionPanel />
 			<PostTaxonomiesPanel />
 			<PostFeaturedImagePanel />
+			<PostExcerptPanel />
 		</>
 	);
 }

packages/editor/src/components/index.js

@@ -32,6 +32,7 @@ export { default as PostAuthorPanel } from './post-author/panel';
 export { default as PostComments } from './post-comments';
 export { default as PostExcerpt } from './post-excerpt';
 export { default as PostExcerptCheck } from './post-excerpt/check';
+export { default as PostExcerptPanel } from './post-excerpt/panel';
 export { default as PostFeaturedImage } from './post-featured-image';
 export { default as PostFeaturedImageCheck } from './post-featured-image/check';
 export { default as PostFeaturedImagePanel } from './post-featured-image/panel';

packages/editor/src/components/post-excerpt/check.js

@@ -1,9 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
 import PostTypeSupportCheck from '../post-type-support-check';
+import { store as editorStore } from '../../store';
 
 function PostExcerptCheck( { children } ) {
+	const postType = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( editorStore );
+		return getEditedPostAttribute( 'type' );
+	}, [] );
+
+	// This special case is unfortunate, but the REST API of wp_template and wp_template_part
+	// support the excerpt field throught the "description" field rather than "excerpt" which means
+	// the default ExcerptPanel won't work for these.
+	if ( [ 'wp_template', 'wp_template_part' ].includes( postType ) ) {
+		return null;
+	}
+
 	return (
 		<PostTypeSupportCheck supportKeys="excerpt">
 			{ children }

packages/edit-post/src/components/sidebar/post-excerpt/index.js → packages/editor/src/components/post-excerpt/panel.js

@@ -3,24 +3,22 @@
  */
 import { __ } from '@wordpress/i18n';
 import { PanelBody } from '@wordpress/components';
-import {
-	PostExcerpt as PostExcerptForm,
-	PostExcerptCheck,
-	store as editorStore,
-} from '@wordpress/editor';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
-import PluginPostExcerpt from '../plugin-post-excerpt';
+import PostExcerptForm from './index';
+import PostExcerptCheck from './check';
+import PluginPostExcerpt from './plugin';
+import { store as editorStore } from '../../store';
 
 /**
  * Module Constants
  */
 const PANEL_NAME = 'post-excerpt';
 
-export default function PostExcerpt() {
+export default function PostExcerptPanel() {
 	const { isOpened, isEnabled } = useSelect( ( select ) => {
 		const { isEditorPanelOpened, isEditorPanelEnabled } =
 			select( editorStore );

packages/edit-post/src/components/sidebar/plugin-post-excerpt/test/index.js → packages/editor/src/components/post-excerpt/test/plugin.js

@@ -11,7 +11,7 @@ import { SlotFillProvider } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import PluginPostExcerptPanel from '../';
+import PluginPostExcerptPanel from '../plugin';
 
 describe( 'PluginPostExcerptPanel', () => {
 	test( 'renders fill properly', () => {

packages/editor/src/private-apis.js

@@ -8,6 +8,7 @@ import { EntitiesSavedStatesExtensible } from './components/entities-saved-state
 import useBlockEditorSettings from './components/provider/use-block-editor-settings';
 import PostPanelRow from './components/post-panel-row';
 import PreviewDropdown from './components/preview-dropdown';
+import PluginPostExcerpt from './components/post-excerpt/plugin';
 
 export const privateApis = {};
 lock( privateApis, {
@@ -16,6 +17,7 @@ lock( privateApis, {
 	EntitiesSavedStatesExtensible,
 	PostPanelRow,
 	PreviewDropdown,
+	PluginPostExcerpt,
 
 	// This is a temporary private API while we're updating the site editor to use EditorProvider.
 	useBlockEditorSettings,