Extensions: Simplify directories

extensions/blocks/business-hours/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/business-hours/index.js

@@ -9,7 +9,7 @@ import { Path } from '@wordpress/components';
  */
 import './editor.scss';
 import BusinessHours from './edit';
-import renderMaterialIcon from '../../utils/render-material-icon';
+import renderMaterialIcon from '../../shared/render-material-icon';
 
 /**
  * Block Registrations:

extensions/blocks/contact-form/components/jetpack-contact-form.js

@@ -13,8 +13,8 @@ import { InnerBlocks, InspectorControls } from '@wordpress/editor';
  * Internal dependencies
  */
 import HelpMessage from '../../../shared/help-message';
-import renderMaterialIcon from '../../../utils/render-material-icon';
-import SubmitButton from '../../../utils/submit-button';
+import renderMaterialIcon from '../../../shared/render-material-icon';
+import SubmitButton from '../../../shared/submit-button';
 
 const ALLOWED_BLOCKS = [
 	'jetpack/markdown',

extensions/blocks/contact-form/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { childBlocks, name, settings } from '.';
 
 registerJetpackBlock( name, settings, childBlocks );

extensions/blocks/contact-form/index.js

@@ -16,7 +16,7 @@ import JetpackField from './components/jetpack-field';
 import JetpackFieldTextarea from './components/jetpack-field-textarea';
 import JetpackFieldCheckbox from './components/jetpack-field-checkbox';
 import JetpackFieldMultiple from './components/jetpack-field-multiple';
-import renderMaterialIcon from '../../utils/render-material-icon';
+import renderMaterialIcon from '../../shared/render-material-icon';
 
 export const name = 'contact-form';
 

extensions/blocks/contact-info/address/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/contact-info/address/index.js

@@ -10,7 +10,7 @@ import { Path, Circle } from '@wordpress/components';
  */
 import edit from './edit';
 import save from './save';
-import renderMaterialIcon from '../../../utils/render-material-icon';
+import renderMaterialIcon from '../../../shared/render-material-icon';
 
 const attributes = {
 	address: {

extensions/blocks/contact-info/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { childBlocks, name, settings } from '.';
 
 registerJetpackBlock( name, settings, childBlocks );

extensions/blocks/contact-info/email/edit.js

@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import save from './save';
-import simpleInput from '../../../utils/simple-input';
+import simpleInput from '../../../shared/simple-input';
 import { __ } from '@wordpress/i18n';
 
 const EmailEdit = props => {

extensions/blocks/contact-info/email/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/contact-info/email/index.js

@@ -8,7 +8,7 @@ import { Path } from '@wordpress/components';
  * Internal dependencies
  */
 import edit from './edit';
-import renderMaterialIcon from '../../../utils/render-material-icon';
+import renderMaterialIcon from '../../../shared/render-material-icon';
 import save from './save';
 
 const attributes = {

extensions/blocks/contact-info/index.js

@@ -9,7 +9,7 @@ import { Path } from '@wordpress/components';
  * Internal dependencies
  */
 import edit from './edit';
-import renderMaterialIcon from '../../utils/render-material-icon';
+import renderMaterialIcon from '../../shared/render-material-icon';
 import './editor.scss';
 import './style.scss';
 import { name as addressName, settings as addressSettings } from './address/';

extensions/blocks/contact-info/phone/edit.js

@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import save from './save';
-import simpleInput from '../../../utils/simple-input';
+import simpleInput from '../../../shared/simple-input';
 
 const PhoneEdit = props => {
 	const { setAttributes } = props;

extensions/blocks/contact-info/phone/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/contact-info/phone/index.js

@@ -8,7 +8,7 @@ import { Path } from '@wordpress/components';
  * Internal dependencies
  */
 import edit from './edit';
-import renderMaterialIcon from '../../../utils/render-material-icon';
+import renderMaterialIcon from '../../../shared/render-material-icon';
 import save from './save';
 
 const attributes = {

extensions/blocks/gif/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/likes/editor.js

@@ -2,6 +2,6 @@
  * Internal dependencies
  */
 import { name, settings } from '.';
-import registerJetpackPlugin from '../../utils/register-jetpack-plugin';
+import registerJetpackPlugin from '../../shared/register-jetpack-plugin';
 
 registerJetpackPlugin( name, settings );

extensions/blocks/mailchimp/edit.js

@@ -3,7 +3,7 @@
  */
 import apiFetch from '@wordpress/api-fetch';
 import classnames from 'classnames';
-import SubmitButton from '../../utils/submit-button';
+import SubmitButton from '../../shared/submit-button';
 import { __ } from '@wordpress/i18n';
 import {
 	Button,

extensions/blocks/mailchimp/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/map/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/markdown/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/publicize/editor.js

@@ -2,6 +2,6 @@
  * Internal dependencies
  */
 import { name, settings } from '.';
-import registerJetpackPlugin from '../../utils/register-jetpack-plugin';
+import registerJetpackPlugin from '../../shared/register-jetpack-plugin';
 
 registerJetpackPlugin( name, settings );

extensions/blocks/related-posts/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/repeat-visitor/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/repeat-visitor/index.js

@@ -7,7 +7,7 @@ import { Path } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import renderMaterialIcon from '../../utils/render-material-icon';
+import renderMaterialIcon from '../../shared/render-material-icon';
 import edit from './components/edit';
 import save from './components/save';
 import { CRITERIA_AFTER, DEFAULT_THRESHOLD } from './constants';

extensions/blocks/seo/editor.js

@@ -2,6 +2,6 @@
  * Internal dependencies
  */
 import { name, settings } from '.';
-import registerJetpackPlugin from '../../utils/register-jetpack-plugin';
+import registerJetpackPlugin from '../../shared/register-jetpack-plugin';
 
 registerJetpackPlugin( name, settings );

extensions/blocks/sharing/editor.js

@@ -2,6 +2,6 @@
  * Internal dependencies
  */
 import { name, settings } from '.';
-import registerJetpackPlugin from '../../utils/register-jetpack-plugin';
+import registerJetpackPlugin from '../../shared/register-jetpack-plugin';
 
 registerJetpackPlugin( name, settings );

extensions/blocks/shortlinks/editor.js

@@ -2,6 +2,6 @@
  * Internal dependencies
  */
 import { name, settings } from '.';
-import registerJetpackPlugin from '../../utils/register-jetpack-plugin';
+import registerJetpackPlugin from '../../shared/register-jetpack-plugin';
 
 registerJetpackPlugin( name, settings );

extensions/blocks/shortlinks/index.js

@@ -10,7 +10,7 @@ import { withSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import ClipboardInput from '../../utils/clipboard-input';
+import ClipboardInput from '../../shared/clipboard-input';
 import JetpackPluginSidebar from '../../shared/jetpack-plugin-sidebar';
 
 export const name = 'shortlinks';

extensions/blocks/simple-payments/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/slideshow/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/subscriptions/edit.js

@@ -9,7 +9,7 @@ import { TextControl, ToggleControl } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import SubmitButton from '../../utils/submit-button';
+import SubmitButton from '../../shared/submit-button';
 
 class SubscriptionEdit extends Component {
 	state = {

extensions/blocks/subscriptions/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/subscriptions/index.js

@@ -11,7 +11,7 @@ import { RawHTML } from '@wordpress/element';
  */
 import edit from './edit';
 import save from './save';
-import renderMaterialIcon from '../../utils/render-material-icon';
+import renderMaterialIcon from '../../shared/render-material-icon';
 
 export const name = 'subscriptions';
 export const settings = {

extensions/blocks/tiled-gallery/deprecated/v1/save.js

@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import Layout from './layout';
-import { getActiveStyleName } from '../../../../utils';
+import { getActiveStyleName } from '../../../../shared/block-styles';
 import { LAYOUT_STYLES } from './constants';
 
 export function defaultColumnsNumber( attributes ) {

extensions/blocks/tiled-gallery/edit.js

@@ -28,7 +28,7 @@ import {
 import FilterToolbar from './filter-toolbar';
 import Layout from './layout';
 import { ALLOWED_MEDIA_TYPES, LAYOUT_STYLES, MAX_COLUMNS } from './constants';
-import { getActiveStyleName } from '../../utils';
+import { getActiveStyleName } from '../../shared/block-styles';
 import { icon } from '.';
 
 const linkOptions = [

extensions/blocks/tiled-gallery/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/blocks/tiled-gallery/save.js

@@ -3,7 +3,7 @@
  */
 import Layout from './layout';
 import { defaultColumnsNumber } from './edit';
-import { getActiveStyleName } from '../../utils';
+import { getActiveStyleName } from '../../shared/block-styles';
 import { LAYOUT_STYLES } from './constants';
 
 export default function TiledGallerySave( { attributes } ) {

extensions/blocks/videopress/editor.js

@@ -12,7 +12,7 @@ import { every } from 'lodash';
  */
 import withVideoPressEdit from './edit';
 import withVideoPressSave from './save';
-import getJetpackExtensionAvailability from '../../utils/get-jetpack-extension-availability';
+import getJetpackExtensionAvailability from '../../shared/get-jetpack-extension-availability';
 
 const addVideoPressSupport = ( settings, name ) => {
 	if ( 'core/video' !== name ) {

extensions/blocks/wordads/editor.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import registerJetpackBlock from '../../utils/register-jetpack-block';
+import registerJetpackBlock from '../../shared/register-jetpack-block';
 import { name, settings } from '.';
 
 registerJetpackBlock( name, settings );

extensions/editor.js

@@ -0,0 +1,5 @@
+/**
+ * Internal dependencies
+ */
+import './shared/public-path';
+import './shared/block-category';

extensions/utils/block-styles.js → extensions/shared/block-styles.js

@@ -34,19 +34,3 @@ export function getActiveStyleName( styles, className ) {
 	const style = getActiveStyle( styles, className );
 	return style ? style.name : null;
 }
-
-export function getDefaultStyleClass( styles ) {
-	const defaultStyle = find( styles, 'isDefault' );
-	return defaultStyle ? `is-style-${ defaultStyle.name }` : null;
-}
-
-/**
- * Checks if className has a class selector starting with `is-style-`
- * Does not check validity of found style.
- *
- * @param  {String}  classNames Optional. Space separated classNames. Defaults to ''.
- * @return {Boolean} true if `classNames` has a Gutenberg style class
- */
-export function hasStyleClass( classNames = '' ) {
-	return classNames.split( ' ' ).some( className => className.startsWith( 'is-style-' ) );
-}