From b4dddc28a1e1e5d2bd2be19e7599ee596025076f Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Fri, 18 Jun 2021 18:26:46 +1000
Subject: [PATCH] Remove @wordpress/editor as a dependency from
 @wordpress/block-library when GUTENBERG_PHASE is 1 (#32801)

---
 package-lock.json                           |  1 -
 packages/block-library/package.json         |  1 -
 packages/block-library/src/calendar/edit.js | 24 +++++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6961d1e495acc..362747ddc9998a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13112,7 +13112,6 @@
 				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
 				"@wordpress/dom": "file:packages/dom",
-				"@wordpress/editor": "file:packages/editor",
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/escape-html": "file:packages/escape-html",
 				"@wordpress/hooks": "file:packages/hooks",
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index b41e8647a1d94a..b6a8215a90f102 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -46,7 +46,6 @@
 		"@wordpress/date": "file:../date",
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/dom": "file:../dom",
-		"@wordpress/editor": "file:../editor",
 		"@wordpress/element": "file:../element",
 		"@wordpress/escape-html": "file:../escape-html",
 		"@wordpress/hooks": "file:../hooks",
diff --git a/packages/block-library/src/calendar/edit.js b/packages/block-library/src/calendar/edit.js
index 567705f3d15082..ef2e96bfb1b9cd 100644
--- a/packages/block-library/src/calendar/edit.js
+++ b/packages/block-library/src/calendar/edit.js
@@ -11,7 +11,6 @@ import { Disabled } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import ServerSideRender from '@wordpress/server-side-render';
 import { useBlockProps } from '@wordpress/block-editor';
-import { store as editorStore } from '@wordpress/editor';
 
 const getYearMonth = memoize( ( date ) => {
 	if ( ! date ) {
@@ -26,15 +25,22 @@ const getYearMonth = memoize( ( date ) => {
 
 export default function CalendarEdit( { attributes } ) {
 	const date = useSelect( ( select ) => {
-		const { getEditedPostAttribute } = select( editorStore );
+		// FIXME: @wordpress/block-library should not depend on @wordpress/editor.
+		// Blocks can be loaded into a *non-post* block editor.
+		// eslint-disable-next-line @wordpress/data-no-store-string-literals
+		const editorSelectors = select( 'core/editor' );
+		let _date;
+		if ( editorSelectors ) {
+			const postType = editorSelectors.getEditedPostAttribute( 'type' );
+			// Dates are used to overwrite year and month used on the calendar.
+			// This overwrite should only happen for 'post' post types.
+			// For other post types the calendar always displays the current month.
+			if ( postType === 'post' ) {
+				_date = editorSelectors.getEditedPostAttribute( 'date' );
+			}
+		}
 
-		const postType = getEditedPostAttribute( 'type' );
-		// Dates are used to overwrite year and month used on the calendar.
-		// This overwrite should only happen for 'post' post types.
-		// For other post types the calendar always displays the current month.
-		return postType === 'post'
-			? getEditedPostAttribute( 'date' )
-			: undefined;
+		return _date;
 	}, [] );
 
 	return (