Gutenberg 5.9 compatibility - moved deprecated components to from `@w…

…ordpress/editor` to `@wordpress/block-editor` Closes #122

.config/externals.js

@@ -22,28 +22,29 @@ const camelCaseDash = string => string.replace(
  */
 const externals = [
 	'api-fetch',
-    'blocks',
-    'components',
-    'compose',
-    'data',
-    'date',
-    'htmlEntities',
-    'hooks',
+	'block-editor',
+	'blocks',
+	'components',
+	'compose',
+	'data',
+	'date',
+	'htmlEntities',
+	'hooks',
 	'edit-post',
-    'element',
-    'editor',
+	'element',
+	'editor',
 	'i18n',
-    'plugins',
-    'viewport',
+	'plugins',
+	'viewport',
 	'ajax',
 	'codeEditor',
 ].reduce( ( externals, name ) => ( {
 	...externals,
 	[ `@wordpress/${ name }` ]: `wp.${ camelCaseDash( name ) }`,
 } ), {
-    wp: 'wp',
-    lodash: 'lodash', // WP loads lodash already.
-    stackable: 'stackable', // Our localized JS variable.
+	wp: 'wp',
+	lodash: 'lodash', // WP loads lodash already.
+	stackable: 'stackable', // Our localized JS variable.
 } );
 
 module.exports = externals;

plugin.php

@@ -88,6 +88,7 @@ function stackable_php_requirement_notice() {
  * Block Initializer.
  */
 require_once( plugin_dir_path( __FILE__ ) . 'src/block/disabled-blocks.php' );
+require_once( plugin_dir_path( __FILE__ ) . 'src/init-deprecated.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/init.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/block/blog-posts/index.php' );
 require_once( plugin_dir_path( __FILE__ ) . 'src/block/blog-posts/designs.php' );

src/block/accordion/deprecated.js

@@ -2,7 +2,7 @@ import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
 import md5 from 'md5'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import SVGArrowIconV112 from './images/arrow-v1-12.svg'
 
 const deprecatedSchema_1_12 = {

src/block/accordion/edit.js

@@ -6,7 +6,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, ToggleControl,
 } from '@wordpress/components'

src/block/accordion/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ArrowIcon } from './index'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 // Accessibility: https://www.w3.org/TR/wai-aria-practices/examples/accordion/accordion.html
 const save = props => {

src/block/blockquote/deprecated.js

@@ -4,7 +4,7 @@ import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
 import { QUOTE_ICONS } from './quotes'
 import { QUOTE_ICONS_1_11 } from './deprecated-quotes'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_13 = props => {
 	const { className } = props

src/block/blockquote/edit.js

@@ -6,7 +6,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'

src/block/blockquote/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { QUOTE_ICONS } from './quotes'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/blog-posts/edit.js

@@ -1,7 +1,7 @@
 import './designs'
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { Component, Fragment } from '@wordpress/element'
 import { dateI18n, format } from '@wordpress/date'
 import { DesignPanelBody, ProControl, ProControlButton } from '@stackable/components/'

src/block/button/edit.js

@@ -1,6 +1,6 @@
 import {
 	BlockAlignmentToolbar, BlockControls, InspectorControls,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, PanelButtonSettings, ProControl, URLInputControl,
 } from '@stackable/components'

src/block/call-to-action/deprecated.js

@@ -8,7 +8,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_12 = {
 	url: {

src/block/call-to-action/edit.js

@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, ToggleControl,
 } from '@wordpress/components'

src/block/call-to-action/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/card/deprecated.js

@@ -7,7 +7,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_12 = props => {
 	const { className } = props

src/block/card/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, ColorPaletteControl, DesignPanelBody, ImageUploadPlaceholder, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'

src/block/card/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/container/deprecated.js

@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { InnerBlocks } from '@wordpress/editor'
+import { InnerBlocks } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	textColor: {

src/block/container/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InnerBlocks, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	HorizontalAlignmentToolbar, PanelBackgroundSettings, ProControl, VerticalAlignmentToolbar,
 } from '@stackable/components'

src/block/container/save.js

@@ -1,6 +1,6 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { InnerBlocks } from '@wordpress/editor'
+import { InnerBlocks } from '@wordpress/block-editor'
 
 const save = props => {
 	const {

src/block/count-up/deprecated.js

@@ -2,7 +2,7 @@ import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { getFontFamily } from './font'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	columns: {

src/block/count-up/edit.js

@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl, SelectControl, ToggleControl,
 } from '@wordpress/components'

src/block/count-up/save.js

@@ -2,7 +2,7 @@ import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { getFontFamily } from './font'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className, attributes } = props

src/block/divider/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { PanelBody, RangeControl } from '@wordpress/components'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'

src/block/expand/deprecated.js

@@ -1,6 +1,6 @@
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	text: {

src/block/expand/edit.js

@@ -1,4 +1,4 @@
-import { InspectorControls, RichText } from '@wordpress/editor'
+import { InspectorControls, RichText } from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'

src/block/expand/save.js

@@ -1,6 +1,6 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/feature-grid/deprecated.js

@@ -1,7 +1,7 @@
 import { descriptionPlaceholder, range } from '@stackable/util'
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_10 = props => {
 	const { attributes, className } = props

src/block/feature-grid/edit.js

@@ -3,7 +3,7 @@ import {
 } from '@stackable/components'
 import {
 	InspectorControls, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	PanelBody, RangeControl,
 } from '@wordpress/components'

src/block/feature-grid/save.js

@@ -2,7 +2,7 @@ import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const save = props => {

src/block/feature/deprecated.js

@@ -6,7 +6,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	textColor: {

src/block/feature/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, DesignPanelBody, ImageUploadPlaceholder, PanelBackgroundSettings, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'

src/block/feature/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 import striptags from 'striptags'
 
 const save = props => {

src/block/ghost-button/edit.js

@@ -1,6 +1,6 @@
 import {
 	BlockAlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText, URLInput,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	Dashicon, IconButton, PanelBody, RangeControl, SelectControl,
 } from '@wordpress/components'

src/block/ghost-button/save.js

@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/header/deprecated.js

@@ -8,7 +8,7 @@ import {
 import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { descriptionPlaceholder } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_12 = props => {
 	const { className } = props

src/block/header/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	ButtonEdit, DesignPanelBody, PanelBackgroundSettings, PanelButtonSettings, ProControl, ProControlButton, URLInputControl,
 } from '@stackable/components'

src/block/header/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import { ButtonEdit } from '@stackable/components'
 import classnames from 'classnames'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/icon-list/deprecated.js

@@ -1,7 +1,7 @@
 import classnames from 'classnames'
 import { getIconSVGBase64 as deprecatedGetIconSVGBase64 } from './deprecated-util'
 import { getIconSVGBase64 } from './util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSave_1_13_3 = props => {
 	const { className } = props

src/block/icon-list/edit.js

@@ -11,7 +11,7 @@ import {
 } from './util'
 import {
 	InspectorControls, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import { __ } from '@wordpress/i18n'
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'

src/block/icon-list/save.js

@@ -1,7 +1,7 @@
 import { applyFilters } from '@wordpress/hooks'
 import classnames from 'classnames'
 import { getIconSVGBase64 } from './util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const save = props => {
 	const { className } = props

src/block/image-box/deprecated.js

@@ -2,7 +2,7 @@ import { __ } from '@wordpress/i18n'
 import classnames from 'classnames'
 import { omit } from 'lodash'
 import { range } from '@stackable/util'
-import { RichText } from '@wordpress/editor'
+import { RichText } from '@wordpress/block-editor'
 
 const deprecatedSchema_1_10 = {
 	columns: {

src/block/image-box/edit.js

@@ -1,6 +1,6 @@
 import {
 	AlignmentToolbar, BlockControls, InspectorControls, PanelColorSettings, RichText,
-} from '@wordpress/editor'
+} from '@wordpress/block-editor'
 import {
 	DesignPanelBody, ImageUploadPlaceholder, ProControl, ProControlButton, URLInputControl, VerticalAlignmentToolbar,
 } from '@stackable/components'