Update @wordpress/editor and remove @types/wordpress__editor (#40291)

* Update @wordpress/editor to the latest version * Remove @types/wordpress__editor as it's no longer needed * Update pnpm-lock.yaml * Fix TS errors following the update * Add changelog * Fix TS error in PluginDocumentSettingPanelAiExcerpt * Restore file
Automattic · Nov 21, 2024 · 080a900 · 080a900
1 parent 2bc0e23
commit 080a900
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 98 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/publicize-components/changelog/update-wordpress-editor b/projects/js-packages/publicize-components/changelog/update-wordpress-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed TS errors following @wordpress/editor update
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
@@ -37,7 +37,7 @@
 		"@wordpress/dataviews": "4.7.0",
 		"@wordpress/date": "5.11.0",
 		"@wordpress/edit-post": "8.11.0",
-		"@wordpress/editor": "14.11.0",
+		"@wordpress/editor": "14.12.0",
 		"@wordpress/element": "6.11.0",
 		"@wordpress/hooks": "4.11.0",
 		"@wordpress/html-entities": "4.11.0",
@@ -63,7 +63,6 @@
 		"@testing-library/user-event": "14.5.2",
 		"@types/jest": "29.5.12",
 		"@types/react": "18.3.12",
-		"@types/wordpress__editor": "13.6.8",
 		"@wordpress/babel-plugin-import-jsx-pragma": "5.11.0",
 		"babel-jest": "29.4.3",
 		"jest": "29.7.0",

diff --git a/projects/js-packages/publicize-components/src/components/form/use-auto-save-and-redirect.ts b/projects/js-packages/publicize-components/src/components/form/use-auto-save-and-redirect.ts
@@ -9,7 +9,6 @@ import { useCallback } from '@wordpress/element';
  * @return {Function} Function to handle autosaving and redirecting.
  */
 export function useAutoSaveAndRedirect(): React.DOMAttributes< HTMLAnchorElement >[ 'onClick' ] {
-	// @ts-expect-error -- `@wordpress/editor` is a nightmare to work with TypeScript
 	const { isEditedPostDirty } = useSelect( editorStore, [] );
 	const { autosave } = useDispatch( editorStore );
 

diff --git a/projects/js-packages/publicize-components/src/components/post-publish-share-status/index.tsx b/projects/js-packages/publicize-components/src/components/post-publish-share-status/index.tsx
@@ -23,7 +23,6 @@ export function PostPublishShareStatus() {
 		const _editorStore = select( editorStore );
 
 		return {
-			// @ts-expect-error -- `@wordpress/editor` is a nightmare to work with TypeScript
 			isPostPublished: _editorStore.isCurrentPostPublished(),
 		};
 	}, [] );

diff --git a/projects/js-packages/publicize-components/src/components/share-buttons/useShareButtonText.ts b/projects/js-packages/publicize-components/src/components/share-buttons/useShareButtonText.ts
@@ -1,4 +1,5 @@
 import { useSelect } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 import { useCallback } from '@wordpress/element';
 import { usePostMeta } from '../../hooks/use-post-meta';
 
@@ -11,9 +12,7 @@ export function useShareButtonText() {
 	const { shareMessage } = usePostMeta();
 	const { message, link } = useSelect(
 		select => {
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			const getEditedPostAttribute = ( select( 'core/editor' ) as any )
-				.getEditedPostAttribute satisfies ( attribute: string ) => unknown;
+			const { getEditedPostAttribute } = select( editorStore );
 
 			return {
 				link: getEditedPostAttribute( 'link' ),

diff --git a/projects/js-packages/publicize-components/src/components/share-status/retry.tsx b/projects/js-packages/publicize-components/src/components/share-status/retry.tsx
@@ -27,7 +27,6 @@ export type RetryProps = {
  */
 export function Retry( { shareItem }: RetryProps ) {
 	const { recordEvent } = useAnalytics();
-	// @ts-expect-error -- `@wordpress/editor` is badly typed, causes issue in CI
 	const postId = useSelect( select => select( editorStore ).getCurrentPostId(), [] );
 	const connections = useSelect( select => select( socialStore ).getConnections(), [] );
 

diff --git a/projects/js-packages/publicize-components/src/components/social-previews/bluesky.tsx b/projects/js-packages/publicize-components/src/components/social-previews/bluesky.tsx
@@ -9,7 +9,6 @@ import { store, CONNECTION_SERVICE_BLUESKY } from '../../social-store';
 const BlueskyPreview = props => {
 	const { message } = useSocialMediaMessage();
 	const { content, siteName } = useSelect( select => {
-		// @ts-expect-error -- `@wordpress/editor` is a nightmare to work with TypeScript
 		const { getEditedPostAttribute } = select( editorStore );
 		// @ts-expect-error -- It says, "Property 'getUnstableBase' does not exist..." but it does
 		const { getUnstableBase } = select( coreStore );

diff --git a/projects/js-packages/publicize-components/src/hooks/use-post-can-use-sig/index.ts b/projects/js-packages/publicize-components/src/hooks/use-post-can-use-sig/index.ts
@@ -10,9 +10,7 @@ import { features } from '../../utils/constants';
  */
 export function usePostCanUseSig() {
 	const isJetpackSocialNote = useSelect( select => {
-		const currentPostType = select( editorStore )
-			// @ts-expect-error -- `@wordpress/editor` is a nightmare to work with TypeScript - getCurrentPostType exists on the editor store
-			.getCurrentPostType();
+		const currentPostType = select( editorStore ).getCurrentPostType();
 
 		return 'jetpack-social-note' === currentPostType;
 	}, [] );

diff --git a/projects/js-packages/publicize-components/src/hooks/use-post-pre-publish-value/index.ts b/projects/js-packages/publicize-components/src/hooks/use-post-pre-publish-value/index.ts
@@ -13,11 +13,7 @@ import { useEffect, useRef, useState } from '@wordpress/element';
  * @return {V} The preserved value.
  */
 export function usePostPrePublishValue< V >( value: V ) {
-	const isPublishing = useSelect(
-		// @ts-expect-error -- `@wordpress/editor` is a nightmare to work with TypeScript
-		select => select( editorStore ).isPublishingPost(),
-		[]
-	);
+	const isPublishing = useSelect( select => select( editorStore ).isPublishingPost(), [] );
 
 	const [ currentValue, setCurrentValue ] = useState( value );
 

diff --git a/projects/packages/videopress/changelog/update-wordpress-editor b/projects/packages/videopress/changelog/update-wordpress-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed TS errors following @wordpress/editor update
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
@@ -74,7 +74,7 @@
 		"@wordpress/data": "10.11.0",
 		"@wordpress/date": "5.11.0",
 		"@wordpress/dom-ready": "4.11.0",
-		"@wordpress/editor": "14.11.0",
+		"@wordpress/editor": "14.12.0",
 		"@wordpress/element": "6.11.0",
 		"@wordpress/html-entities": "4.11.0",
 		"@wordpress/i18n": "5.11.0",

diff --git a/projects/plugins/jetpack/changelog/update-wordpress-editor b/projects/plugins/jetpack/changelog/update-wordpress-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Fixed TS errors following @wordpress/editor update
diff --git a/projects/plugins/jetpack/extensions/blocks/voice-to-content/edit.tsx b/projects/plugins/jetpack/extensions/blocks/voice-to-content/edit.tsx
@@ -10,6 +10,7 @@ import { ThemeProvider } from '@automattic/jetpack-components';
 import { useAnalytics } from '@automattic/jetpack-shared-extension-utils';
 import { Button, Modal, Icon } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 import { useCallback, useEffect, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { external } from '@wordpress/icons';
@@ -24,7 +25,6 @@ import useTranscriptionInserter from './hooks/use-transcription-inserter';
 /**
  * Types
  */
-import type { Block } from '@automattic/jetpack-ai-client';
 import type {
 	RecordingState,
 	TranscriptionState,
@@ -62,9 +62,7 @@ export default function VoiceToContentEdit( { clientId } ) {
 		removeBlock: ( id: string ) => void;
 	};
 
-	const { getBlocks } = useSelect( select => select( 'core/editor' ), [] ) as {
-		getBlocks: () => Block[];
-	};
+	const { getBlocks } = useSelect( select => select( editorStore ), [] );
 
 	const destroyBlock = useCallback( () => {
 		// Remove the block from the editor

diff --git a/...k/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx b/...k/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
@@ -38,7 +38,6 @@ import './style.scss';
  * Types
  */
 import type { CoreSelect, JetpackSettingsContentProps } from './types';
-import type * as EditorSelectors from '@wordpress/editor/store/selectors';
 
 const debug = debugFactory( 'jetpack-ai-assistant-plugin:sidebar' );
 /**
@@ -163,7 +162,7 @@ export default function AiAssistantPluginSidebar() {
 	const { tracks } = useAnalytics();
 
 	const isViewable = useSelect( select => {
-		const postTypeName = ( select( editorStore ) as typeof EditorSelectors ).getCurrentPostType();
+		const postTypeName = select( editorStore ).getCurrentPostType();
 		// The coreStore select type lacks the getPostType method, so we need to cast it to the correct type
 		const postTypeObject = ( select( coreStore ) as unknown as CoreSelect ).getPostType(
 			postTypeName

diff --git a/...ects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/feedback/index.tsx b/...ects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/feedback/index.tsx
@@ -5,6 +5,7 @@ import { useAiSuggestions } from '@automattic/jetpack-ai-client';
 import { useAnalytics } from '@automattic/jetpack-shared-extension-utils';
 import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 import { useCallback, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import React from 'react';
@@ -14,10 +15,6 @@ import React from 'react';
 import usePostContent from '../../hooks/use-post-content';
 import AiAssistantModal from '../modal';
 import './style.scss';
-/**
- * Types
- */
-import type * as EditorSelectors from '@wordpress/editor/store/selectors';
 
 export default function Feedback( {
 	disabled = false,
@@ -32,10 +29,7 @@ export default function Feedback( {
 	const [ suggestion, setSuggestion ] = useState< Array< React.JSX.Element | null > >( [ null ] );
 	const { tracks } = useAnalytics();
 
-	const postId = useSelect(
-		select => ( select( 'core/editor' ) as typeof EditorSelectors ).getCurrentPostId(),
-		[]
-	);
+	const postId = useSelect( select => select( editorStore ).getCurrentPostId(), [] );
 	const postContent = usePostContent();
 
 	const toggleFeedbackModal = () => {