From 96de5a8605073672c879d40295dc16042765ef6f Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Wed, 29 May 2024 10:31:33 +0100 Subject: [PATCH] Editor: Unify the MediaUpload hook between post and site editors. (#62085) Co-authored-by: youknowriad Co-authored-by: Mamaduka --- package-lock.json | 4 ---- packages/edit-post/package.json | 1 - packages/edit-post/src/hooks/components/index.js | 13 ------------- packages/edit-post/src/hooks/index.js | 1 - packages/edit-site/package.json | 1 - packages/edit-site/src/hooks/index.js | 1 - packages/editor/src/hooks/index.js | 1 + .../src/hooks/media-upload.js} | 2 +- 8 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 packages/edit-post/src/hooks/components/index.js rename packages/{edit-site/src/hooks/components.js => editor/src/hooks/media-upload.js} (81%) diff --git a/package-lock.json b/package-lock.json index 2d2698149813a2..ea29fafb92e230 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54123,7 +54123,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/plugins": "file:../plugins", "@wordpress/preferences": "file:../preferences", @@ -54176,7 +54175,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", "@wordpress/plugins": "file:../plugins", @@ -69274,7 +69272,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/plugins": "file:../plugins", "@wordpress/preferences": "file:../preferences", @@ -69317,7 +69314,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", "@wordpress/plugins": "file:../plugins", diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json index 1c45301173d24d..a968caadb3191d 100644 --- a/packages/edit-post/package.json +++ b/packages/edit-post/package.json @@ -48,7 +48,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/plugins": "file:../plugins", "@wordpress/preferences": "file:../preferences", diff --git a/packages/edit-post/src/hooks/components/index.js b/packages/edit-post/src/hooks/components/index.js deleted file mode 100644 index 709d89d013ed5a..00000000000000 --- a/packages/edit-post/src/hooks/components/index.js +++ /dev/null @@ -1,13 +0,0 @@ -/** - * WordPress dependencies - */ -import { addFilter } from '@wordpress/hooks'; -import { MediaUpload } from '@wordpress/media-utils'; - -const replaceMediaUpload = () => MediaUpload; - -addFilter( - 'editor.MediaUpload', - 'core/edit-post/replace-media-upload', - replaceMediaUpload -); diff --git a/packages/edit-post/src/hooks/index.js b/packages/edit-post/src/hooks/index.js index dc90f62760a7d1..0397f1fee936c3 100644 --- a/packages/edit-post/src/hooks/index.js +++ b/packages/edit-post/src/hooks/index.js @@ -1,5 +1,4 @@ /** * Internal dependencies */ -import './components'; import './validate-multiple-use'; diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json index 5336726300a5cd..7132e67401a225 100644 --- a/packages/edit-site/package.json +++ b/packages/edit-site/package.json @@ -54,7 +54,6 @@ "@wordpress/icons": "file:../icons", "@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts", "@wordpress/keycodes": "file:../keycodes", - "@wordpress/media-utils": "file:../media-utils", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", "@wordpress/plugins": "file:../plugins", diff --git a/packages/edit-site/src/hooks/index.js b/packages/edit-site/src/hooks/index.js index 185d069f784792..66f1b6e17eb0c2 100644 --- a/packages/edit-site/src/hooks/index.js +++ b/packages/edit-site/src/hooks/index.js @@ -1,5 +1,4 @@ /** * Internal dependencies */ -import './components'; import './push-changes-to-global-styles'; diff --git a/packages/editor/src/hooks/index.js b/packages/editor/src/hooks/index.js index 75bb34abf6cfa3..6001d53f65c103 100644 --- a/packages/editor/src/hooks/index.js +++ b/packages/editor/src/hooks/index.js @@ -3,4 +3,5 @@ */ import './custom-sources-backwards-compatibility'; import './default-autocompleters'; +import './media-upload'; import './pattern-overrides'; diff --git a/packages/edit-site/src/hooks/components.js b/packages/editor/src/hooks/media-upload.js similarity index 81% rename from packages/edit-site/src/hooks/components.js rename to packages/editor/src/hooks/media-upload.js index 614dfe62db2f98..311ec4ec5eec1c 100644 --- a/packages/edit-site/src/hooks/components.js +++ b/packages/editor/src/hooks/media-upload.js @@ -6,6 +6,6 @@ import { MediaUpload } from '@wordpress/media-utils'; addFilter( 'editor.MediaUpload', - 'core/edit-site/components/media-upload', + 'core/editor/components/media-upload', () => MediaUpload );