Gutenberg: move Gutenberg extension registration into init

We want to avoid putting any Calypso custom code into edit-post folder.
New editor initialization function seems like a better place to do it.

Author: vindl

client/gutenberg/editor/api-middleware/index.js

@@ -29,7 +29,7 @@ const debugMiddleware = ( options, next ) => {
 
 // Rewrite default API paths to match WP.com equivalents. Note that
 // passed apiNamespace will be prepended to the replaced path.
-const wpcomPathMappingMiddleware = ( options, next, siteSlug ) => {
+export const wpcomPathMappingMiddleware = ( options, next, siteSlug ) => {
 	// wp/v2 namespace mapping
 	//
 	// Path rewrite example:

client/gutenberg/editor/edit-post/editor.js

@@ -2,7 +2,6 @@
  * External dependencies
  */
 import React from 'react';
-import { isEnabled } from 'config';
 
 /**
  * WordPress dependencies
@@ -16,10 +15,6 @@ import { EditorProvider, ErrorBoundary } from '@wordpress/editor';
 import Layout from './components/layout';
 import './store';
 
-if ( isEnabled( 'gutenberg/block/jetpack-preset' ) ) {
-	require( 'gutenberg/extensions/presets/jetpack/editor.js' );
-}
-
 function Editor( { settings, hasFixedToolbar, post, overridePost, onError, ...props } ) {
 	if ( ! post ) {
 		return null;

client/gutenberg/editor/init.js

@@ -10,6 +10,7 @@ import { once } from 'lodash';
  * Internal dependencies
  */
 import { applyAPIMiddleware } from './api-middleware';
+import { isEnabled } from 'config';
 import debugFactory from 'debug';
 
 const debug = debugFactory( 'calypso:gutenberg' );
@@ -20,8 +21,16 @@ const WPCOM_UNSUPPORTED_CORE_BLOCKS = [
 	'core/file', // see D19851 for more details.
 ];
 
-// We need to ensure that his function is executed only once to avoid
-// registering core blocks and applying middleware twice.
+const loadA8CExtensions = () => {
+	require( '../extensions/classic-block/editor' );
+
+	if ( isEnabled( 'gutenberg/block/jetpack-preset' ) ) {
+		require( 'gutenberg/extensions/presets/jetpack/editor.js' );
+	}
+};
+
+// We need to ensure that his function is executed only once to avoid duplicate
+// block registration, API middleware application etc.
 export const initGutenberg = once( ( userId, siteSlug ) => {
 	debug( 'Starting Gutenberg editor initialization...' );
 
@@ -36,18 +45,14 @@ export const initGutenberg = once( ( userId, siteSlug ) => {
 
 	// Avoid using top level imports for this since they will statically
 	// initialize core-data before required plugins are loaded.
-	const blockLibrary = require( '@wordpress/block-library' );
-	const blocks = require( '@wordpress/blocks' );
+	const { registerCoreBlocks } = require( '@wordpress/block-library' );
+	const { unregisterBlockType, setFreeformContentHandlerName } = require( '@wordpress/blocks' );
 
 	debug( 'Registering core blocks' );
-	blockLibrary.registerCoreBlocks();
+	registerCoreBlocks();
 
 	debug( 'Removing core blocks that are not yet supported in Calypso' );
-	WPCOM_UNSUPPORTED_CORE_BLOCKS.forEach( blockName => blocks.unregisterBlockType( blockName ) );
-
-	debug( 'Registering Calypso Classic Block handler' );
-	require( '../extensions/classic-block/editor' );
-	blocks.setFreeformContentHandlerName( 'a8c/classic' );
+	WPCOM_UNSUPPORTED_CORE_BLOCKS.forEach( blockName => unregisterBlockType( blockName ) );
 
 	// Needed for list block indent/outdent functionality
 	debug( 'Loading required TinyMCE plugins' );
@@ -59,6 +64,12 @@ export const initGutenberg = once( ( userId, siteSlug ) => {
 	debug( 'Applying API middleware' );
 	applyAPIMiddleware( siteSlug );
 
+	debug( 'Loading A8C editor extensions' );
+	loadA8CExtensions();
+
+	debug( 'Registering Calypso Classic Block handler' );
+	setFreeformContentHandlerName( 'a8c/classic' );
+
 	debug( 'Gutenberg editor initialization complete.' );
 
 	return require( 'gutenberg/editor/main' ).default;

client/gutenberg/editor/main.jsx

@@ -17,7 +17,7 @@ import QueryPostTypes from 'components/data/query-post-types';
 import { createAutoDraft, requestSitePost, requestGutenbergDemoContent } from 'state/data-getters';
 import { getHttpData } from 'state/data-layer/http-data';
 import { translate } from 'i18n-calypso';
-import './hooks'; // Load hooks that are needed for integrating Calypso's Media Modal
+import './hooks'; // Needed for integrating Calypso's media library (and other hooks)
 
 class GutenbergEditor extends Component {
 	componentDidMount() {