Packages: Remove package import statements in favor of store object u…

…sage (#27368)
WordPress · Nov 30, 2020 · 7b5d1a7 · 7b5d1a7
1 parent 02bc517
commit 7b5d1a7
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-directory/src/store/actions.js b/packages/block-directory/src/store/actions.js
@@ -1,6 +1,7 @@
 /**
  * WordPress dependencies
  */
+import { store as blocksStore } from '@wordpress/blocks';
 import { __ } from '@wordpress/i18n';
 import { controls } from '@wordpress/data';
 import { apiFetch } from '@wordpress/data-controls';
@@ -85,7 +86,7 @@ export function* installBlockType( block ) {
 
 		yield loadAssets( assets );
 		const registeredBlocks = yield controls.select(
-			'core/blocks',
+			blocksStore.name,
 			'getBlockTypes'
 		);
 		if ( ! registeredBlocks.some( ( i ) => i.name === block.name ) ) {

diff --git a/packages/block-directory/src/store/test/actions.js b/packages/block-directory/src/store/test/actions.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blocksStore } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
@@ -80,7 +85,7 @@ describe( 'actions', () => {
 			expect( generator.next().value ).toEqual( {
 				args: [],
 				selectorName: 'getBlockTypes',
-				storeKey: 'core/blocks',
+				storeKey: blocksStore.name,
 				type: '@@data/SELECT',
 			} );
 
@@ -142,7 +147,7 @@ describe( 'actions', () => {
 			expect( generator.next().value ).toEqual( {
 				args: [],
 				selectorName: 'getBlockTypes',
-				storeKey: 'core/blocks',
+				storeKey: blocksStore.name,
 				type: '@@data/SELECT',
 			} );
 

diff --git a/packages/block-editor/src/index.js b/packages/block-editor/src/index.js
@@ -1,9 +1,7 @@
 /**
  * WordPress dependencies
  */
-import '@wordpress/blocks';
 import '@wordpress/rich-text';
-import '@wordpress/keyboard-shortcuts';
 import '@wordpress/notices';
 
 /**

diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
@@ -4,7 +4,6 @@
 import '@wordpress/core-data';
 import '@wordpress/notices';
 import '@wordpress/block-editor';
-import '@wordpress/reusable-blocks';
 import {
 	registerBlockType,
 	setDefaultBlockName,

diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
@@ -46,7 +46,6 @@
 		"@wordpress/notices": "file:../notices",
 		"@wordpress/plugins": "file:../plugins",
 		"@wordpress/primitives": "file:../primitives",
-		"@wordpress/reusable-blocks": "file:../reusable-blocks",
 		"@wordpress/url": "file:../url",
 		"@wordpress/viewport": "file:../viewport",
 		"@wordpress/warning": "file:../warning",

diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
@@ -4,8 +4,6 @@
 import '@wordpress/core-data';
 import '@wordpress/block-editor';
 import '@wordpress/editor';
-import '@wordpress/keyboard-shortcuts';
-import '@wordpress/reusable-blocks';
 import '@wordpress/notices';
 import {
 	registerCoreBlocks,

diff --git a/packages/edit-post/src/index.native.js b/packages/edit-post/src/index.native.js
@@ -4,7 +4,6 @@
 import '@wordpress/core-data';
 import '@wordpress/notices';
 import '@wordpress/format-library';
-import '@wordpress/reusable-blocks';
 import { render } from '@wordpress/element';
 
 /**

diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
@@ -12,7 +12,6 @@ import {
 	__experimentalGetCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
-import '@wordpress/reusable-blocks';
 
 /**
  * Internal dependencies

diff --git a/packages/editor/src/index.js b/packages/editor/src/index.js
@@ -2,11 +2,8 @@
  * WordPress dependencies
  */
 import '@wordpress/block-editor';
-import '@wordpress/blocks';
 import '@wordpress/core-data';
-import '@wordpress/keyboard-shortcuts';
 import '@wordpress/notices';
-import '@wordpress/reusable-blocks';
 import '@wordpress/rich-text';
 
 /**

diff --git a/packages/editor/src/index.native.js b/packages/editor/src/index.native.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import '@wordpress/block-editor';
-import '@wordpress/blocks';
 import '@wordpress/core-data';
 import '@wordpress/rich-text';