Deprecated the selectors/actions and components that moved to the bl…

…ock editor module (#15770)
WordPress · Jun 10, 2019 · a8e9692 · a8e9692
1 parent 2afa08f
commit a8e9692
Show file tree

Hide file tree

Showing 28 changed files with 316 additions and 143 deletions.
diff --git a/packages/e2e-test-utils/README.md b/packages/e2e-test-utils/README.md
@@ -207,7 +207,7 @@ _Returns_
 
 <a name="getAllBlocks" href="#getAllBlocks">#</a> **getAllBlocks**
 
-Returns an array with all blocks; Equivalent to calling wp.data.select( 'core/editor' ).getBlocks();
+Returns an array with all blocks; Equivalent to calling wp.data.select( 'core/block-editor' ).getBlocks();
 
 _Returns_
 

diff --git a/packages/e2e-test-utils/src/get-all-blocks.js b/packages/e2e-test-utils/src/get-all-blocks.js
@@ -4,10 +4,10 @@
 import { wpDataSelect } from './wp-data-select';
 
 /**
- * Returns an array with all blocks; Equivalent to calling wp.data.select( 'core/editor' ).getBlocks();
+ * Returns an array with all blocks; Equivalent to calling wp.data.select( 'core/block-editor' ).getBlocks();
  *
  * @return {Promise} Promise resolving with an array containing all blocks in the document.
  */
 export function getAllBlocks() {
-	return wpDataSelect( 'core/editor', 'getBlocks' );
+	return wpDataSelect( 'core/block-editor', 'getBlocks' );
 }
diff --git a/packages/e2e-test-utils/src/select-block-by-client-id.js b/packages/e2e-test-utils/src/select-block-by-client-id.js
@@ -5,6 +5,6 @@
  */
 export async function selectBlockByClientId( clientId ) {
 	await page.evaluate( ( id ) => {
-		wp.data.dispatch( 'core/editor' ).selectBlock( id );
+		wp.data.dispatch( 'core/block-editor' ).selectBlock( id );
 	}, clientId );
 }
diff --git a/packages/e2e-test-utils/src/set-post-content.js b/packages/e2e-test-utils/src/set-post-content.js
@@ -8,6 +8,6 @@ export async function setPostContent( content ) {
 	return await page.evaluate( ( _content ) => {
 		const { dispatch } = window.wp.data;
 		const blocks = wp.blocks.parse( _content );
-		dispatch( 'core/editor' ).resetBlocks( blocks );
+		dispatch( 'core/block-editor' ).resetBlocks( blocks );
 	}, content );
 }
diff --git a/packages/e2e-tests/plugins/align-hook.php b/packages/e2e-tests/plugins/align-hook.php
@@ -17,7 +17,7 @@ function enqueue_align_plugin_script() {
 		array(
 			'wp-blocks',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-i18n',
 		),
 		filemtime( plugin_dir_path( __FILE__ ) . 'align-hook/index.js' ),

diff --git a/packages/e2e-tests/plugins/align-hook/index.js b/packages/e2e-tests/plugins/align-hook/index.js
@@ -1,7 +1,7 @@
 ( function() {
 	var registerBlockType = wp.blocks.registerBlockType;
 	var el = wp.element.createElement;
-	var InnerBlocks = wp.editor.InnerBlocks;
+	var InnerBlocks = wp.blockEditor.InnerBlocks;
 	var __ = wp.i18n.__;
 	var TEMPLATE = [
 		[ 'core/paragraph', { fontSize: 'large', content: __( 'Content…' ) } ],

diff --git a/packages/e2e-tests/plugins/block-icons.php b/packages/e2e-tests/plugins/block-icons.php
@@ -18,7 +18,7 @@ function enqueue_block_icons_plugin_script() {
 			'wp-blocks',
 			'wp-components',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-hooks',
 			'wp-i18n',
 		),

diff --git a/packages/e2e-tests/plugins/block-icons/index.js b/packages/e2e-tests/plugins/block-icons/index.js
@@ -1,7 +1,7 @@
 ( function() {
 	var registerBlockType = wp.blocks.registerBlockType;
 	var el = wp.element.createElement;
-	var InnerBlocks = wp.editor.InnerBlocks;
+	var InnerBlocks = wp.blockEditor.InnerBlocks;
     var circle = el( 'circle', { cx: 10, cy: 10, r: 10, fill: 'red', stroke: 'blue', strokeWidth: '10' } );
     var svg = el( 'svg', { width: 20, height: 20, viewBox: '0 0 20 20' }, circle );
 

diff --git a/packages/e2e-tests/plugins/container-without-paragraph.php b/packages/e2e-tests/plugins/container-without-paragraph.php
@@ -17,7 +17,7 @@ function enqueue_container_without_paragraph_plugin_script() {
 		array(
 			'wp-blocks',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 		),
 		filemtime( plugin_dir_path( __FILE__ ) . 'container-without-paragraph/index.js' ),
 		true

diff --git a/packages/e2e-tests/plugins/container-without-paragraph/index.js b/packages/e2e-tests/plugins/container-without-paragraph/index.js
@@ -5,13 +5,13 @@
 		icon: 'yes',
 
 		edit() {
-			return wp.element.createElement(wp.editor.InnerBlocks, {
+			return wp.element.createElement(wp.blockEditor.InnerBlocks, {
 				allowedBlocks: ['core/image', 'core/gallery']
 			});
 		},
 
 		save() {
-			return wp.element.createElement(wp.editor.InnerBlocks.Content);
+			return wp.element.createElement(wp.blockEditor.InnerBlocks.Content);
 		},
 	})
 } )();
diff --git a/packages/e2e-tests/plugins/deprecated-node-matcher.php b/packages/e2e-tests/plugins/deprecated-node-matcher.php
@@ -18,7 +18,7 @@ function enqueue_deprecated_node_matcher_plugin_script() {
 			'lodash',
 			'wp-blocks',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 		),
 		filemtime( plugin_dir_path( __FILE__ ) . 'deprecated-node-matcher/index.js' ),
 		true

diff --git a/packages/e2e-tests/plugins/deprecated-node-matcher/index.js b/packages/e2e-tests/plugins/deprecated-node-matcher/index.js
@@ -1,6 +1,6 @@
 ( function() {
 	var registerBlockType = wp.blocks.registerBlockType;
-	var RichText = wp.editor.RichText;
+	var RichText = wp.blockEditor.RichText;
 	var el = wp.element.createElement;
 	var el = wp.element.createElement;
 

diff --git a/packages/e2e-tests/plugins/format-api.php b/packages/e2e-tests/plugins/format-api.php
@@ -14,7 +14,7 @@ function gutenberg_test_format_api_scripts() {
 	wp_enqueue_script(
 		'gutenberg-test-format-api',
 		plugins_url( 'format-api/index.js', __FILE__ ),
-		array( 'wp-editor', 'wp-element', 'wp-rich-text' ),
+		array( 'wp-block-editor', 'wp-element', 'wp-rich-text' ),
 		filemtime( plugin_dir_path( __FILE__ ) . 'format-api/index.js' ),
 		true
 	);

diff --git a/packages/e2e-tests/plugins/format-api/index.js b/packages/e2e-tests/plugins/format-api/index.js
@@ -9,7 +9,7 @@
 			className: 'my-plugin-link',
 			edit: function( props ) {
 				return wp.element.createElement(
-					wp.editor.RichTextToolbarButton, {
+					wp.blockEditor.RichTextToolbarButton, {
 						icon: 'admin-links',
 						title: 'Custom Link',
 						onClick: function() {

diff --git a/packages/e2e-tests/plugins/hooks-api.php b/packages/e2e-tests/plugins/hooks-api.php
@@ -18,7 +18,7 @@ function enqueue_hooks_plugin_script() {
 			'wp-blocks',
 			'wp-components',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-hooks',
 			'wp-i18n',
 		),

diff --git a/packages/e2e-tests/plugins/hooks-api/index.js b/packages/e2e-tests/plugins/hooks-api/index.js
@@ -3,7 +3,7 @@
 	var Fragment = wp.element.Fragment;
 	var Button = wp.components.Button;
 	var PanelBody = wp.components.PanelBody;
-	var InspectorControls = wp.editor.InspectorControls;
+	var InspectorControls = wp.blockEditor.InspectorControls;
 	var addFilter = wp.hooks.addFilter;
 	var createBlock = wp.blocks.createBlock;
 	var __ = wp.i18n.__;

diff --git a/packages/e2e-tests/plugins/inner-blocks-allowed-blocks.php b/packages/e2e-tests/plugins/inner-blocks-allowed-blocks.php
@@ -16,7 +16,7 @@ function enqueue_inner_blocks_allowed_blocks_script() {
 		plugins_url( 'inner-blocks-allowed-blocks/index.js', __FILE__ ),
 		array(
 			'wp-blocks',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-element',
 			'wp-i18n',
 		),

diff --git a/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js b/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js
@@ -2,7 +2,7 @@
 	const { withSelect } = wp.data;
 	const { registerBlockType } = wp.blocks;
 	const { createElement: el } = wp.element;
-	const { InnerBlocks } = wp.editor;
+	const { InnerBlocks } = wp.blockEditor;
 	const __ = wp.i18n.__;
 	const divProps = { className: 'product', style: { outline: '1px solid gray', padding: 5 } };
 	const template = [
@@ -64,7 +64,7 @@
 		category: 'common',
 
 		edit: withSelect( function( select, ownProps ) {
-			var getBlockOrder = select( 'core/editor' ).getBlockOrder;
+			var getBlockOrder = select( 'core/block-editor' ).getBlockOrder;
 			return {
 				numberOfChildren: getBlockOrder( ownProps.clientId ).length,
 			};

diff --git a/packages/e2e-tests/plugins/inner-blocks-templates.php b/packages/e2e-tests/plugins/inner-blocks-templates.php
@@ -18,7 +18,7 @@ function enqueue_container_without_paragraph_plugin_script() {
 			'wp-blocks',
 			'wp-components',
 			'wp-element',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-hooks',
 			'wp-i18n',
 		),

diff --git a/packages/e2e-tests/plugins/inner-blocks-templates/index.js b/packages/e2e-tests/plugins/inner-blocks-templates/index.js
@@ -2,7 +2,7 @@
 	var registerBlockType = wp.blocks.registerBlockType;
 	var createBlock = wp.blocks.createBlock;
 	var el = wp.element.createElement;
-	var InnerBlocks = wp.editor.InnerBlocks;
+	var InnerBlocks = wp.blockEditor.InnerBlocks;
 	var __ = wp.i18n.__;
 	var TEMPLATE = [
 		[ 'core/paragraph', {

diff --git a/packages/e2e-tests/plugins/plugins-api.php b/packages/e2e-tests/plugins/plugins-api.php
@@ -45,6 +45,7 @@ function enqueue_plugins_api_plugin_scripts() {
 			'wp-compose',
 			'wp-data',
 			'wp-edit-post',
+			'wp-block-editor',
 			'wp-editor',
 			'wp-element',
 			'wp-i18n',
@@ -63,7 +64,7 @@ function enqueue_plugins_api_plugin_scripts() {
 			'wp-compose',
 			'wp-data',
 			'wp-edit-post',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-element',
 			'wp-i18n',
 			'wp-plugins',

diff --git a/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js b/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js
@@ -7,7 +7,7 @@
 	var withSelect = wp.data.withSelect;
 	var select = wp.data.select;
 	var dispatch = wp.data.dispatch;
-	var PlainText = wp.editor.PlainText;
+	var PlainText = wp.blockEditor.PlainText;
 	var Fragment = wp.element.Fragment;
 	var el = wp.element.createElement;
 	var Component = wp.element.Component;
@@ -63,7 +63,7 @@
 						onClick: () => {
 							dispatch( 'core/annotations' ).__experimentalAddAnnotation( {
 								source: 'e2e-tests',
-								blockClientId: select( 'core/editor' ).getBlockOrder()[ 0 ],
+								blockClientId: select( 'core/block-editor' ).getBlockOrder()[ 0 ],
 								richTextIdentifier: 'content',
 								range: {
 									start: parseInt( this.state.start, 10 ),

diff --git a/packages/e2e-tests/plugins/plugins-api/sidebar.js b/packages/e2e-tests/plugins/plugins-api/sidebar.js
@@ -7,7 +7,7 @@
 	var withSelect = wp.data.withSelect;
 	var select = wp.data.select;
 	var dispatch = wp.data.dispatch;
-	var PlainText = wp.editor.PlainText;
+	var PlainText = wp.blockEditor.PlainText;
 	var Fragment = wp.element.Fragment;
 	var el = wp.element.createElement;
 	var __ = wp.i18n.__;

diff --git a/packages/e2e-tests/specs/reusable-blocks.test.js b/packages/e2e-tests/specs/reusable-blocks.test.js
@@ -24,9 +24,9 @@ describe( 'Reusable Blocks', () => {
 	beforeEach( async () => {
 		// Remove all blocks from the post so that we're working with a clean slate
 		await page.evaluate( () => {
-			const blocks = wp.data.select( 'core/editor' ).getBlocks();
+			const blocks = wp.data.select( 'core/block-editor' ).getBlocks();
 			const clientIds = blocks.map( ( block ) => block.clientId );
-			wp.data.dispatch( 'core/editor' ).removeBlocks( clientIds );
+			wp.data.dispatch( 'core/block-editor' ).removeBlocks( clientIds );
 		} );
 	} );