Move transform styles function to blockEditor package. (#15572)

This commit moves the transform styles function to blockEditor package so they can safely be used by the blocks.
WordPress · May 28, 2019 · bb24bbe · bb24bbe
1 parent b14d70c
commit bb24bbe
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 7 deletions.
diff --git a/packages/block-editor/src/index.js b/packages/block-editor/src/index.js
@@ -13,5 +13,6 @@ import './store';
 import './hooks';
 
 export * from './components';
+export * from './utils';
 
 export { SETTINGS_DEFAULTS } from './store/defaults';
diff --git a/packages/block-editor/src/utils/index.js b/packages/block-editor/src/utils/index.js
@@ -0,0 +1,4 @@
+/**
+ * Internal dependencies
+ */
+export { default as __experimentalTransformStyles } from './transform-styles';
diff --git a/...ges/editor/src/editor-styles/ast/index.js → ...r/src/utils/transform-styles/ast/index.js b/...ges/editor/src/editor-styles/ast/index.js → ...r/src/utils/transform-styles/ast/index.js
diff --git a/...ges/editor/src/editor-styles/ast/parse.js → ...r/src/utils/transform-styles/ast/parse.js b/...ges/editor/src/editor-styles/ast/parse.js → ...r/src/utils/transform-styles/ast/parse.js
diff --git a/...c/editor-styles/ast/stringify/compiler.js → ...ransform-styles/ast/stringify/compiler.js b/...c/editor-styles/ast/stringify/compiler.js → ...ransform-styles/ast/stringify/compiler.js
diff --git a/...c/editor-styles/ast/stringify/compress.js → ...ransform-styles/ast/stringify/compress.js b/...c/editor-styles/ast/stringify/compress.js → ...ransform-styles/ast/stringify/compress.js
diff --git a/...c/editor-styles/ast/stringify/identity.js → ...ransform-styles/ast/stringify/identity.js b/...c/editor-styles/ast/stringify/identity.js → ...ransform-styles/ast/stringify/identity.js
diff --git a/.../src/editor-styles/ast/stringify/index.js → ...s/transform-styles/ast/stringify/index.js b/.../src/editor-styles/ast/stringify/index.js → ...s/transform-styles/ast/stringify/index.js
diff --git a/packages/editor/src/editor-styles/index.js → ...ditor/src/utils/transform-styles/index.js b/packages/editor/src/editor-styles/index.js → ...ditor/src/utils/transform-styles/index.js
diff --git a/...tyles/test/__snapshots__/traverse.js.snap → ...tyles/test/__snapshots__/traverse.js.snap b/...tyles/test/__snapshots__/traverse.js.snap → ...tyles/test/__snapshots__/traverse.js.snap
diff --git a/...editor/src/editor-styles/test/traverse.js → ...c/utils/transform-styles/test/traverse.js b/...editor/src/editor-styles/test/traverse.js → ...c/utils/transform-styles/test/traverse.js
diff --git a/...ms/test/__snapshots__/url-rewrite.js.snap → ...ms/test/__snapshots__/url-rewrite.js.snap b/...ms/test/__snapshots__/url-rewrite.js.snap → ...ms/test/__snapshots__/url-rewrite.js.snap
diff --git a/...ransforms/test/__snapshots__/wrap.js.snap → ...ransforms/test/__snapshots__/wrap.js.snap b/...ransforms/test/__snapshots__/wrap.js.snap → ...ransforms/test/__snapshots__/wrap.js.snap
diff --git a/...tor-styles/transforms/test/url-rewrite.js → ...orm-styles/transforms/test/url-rewrite.js b/...tor-styles/transforms/test/url-rewrite.js → ...orm-styles/transforms/test/url-rewrite.js
diff --git a/...src/editor-styles/transforms/test/wrap.js → .../transform-styles/transforms/test/wrap.js b/...src/editor-styles/transforms/test/wrap.js → .../transform-styles/transforms/test/wrap.js
diff --git a/...c/editor-styles/transforms/url-rewrite.js → ...ransform-styles/transforms/url-rewrite.js b/...c/editor-styles/transforms/url-rewrite.js → ...ransform-styles/transforms/url-rewrite.js
diff --git a/...itor/src/editor-styles/transforms/wrap.js → ...utils/transform-styles/transforms/wrap.js b/...itor/src/editor-styles/transforms/wrap.js → ...utils/transform-styles/transforms/wrap.js
diff --git a/...ages/editor/src/editor-styles/traverse.js → ...or/src/utils/transform-styles/traverse.js b/...ages/editor/src/editor-styles/traverse.js → ...or/src/utils/transform-styles/traverse.js
diff --git a/packages/block-library/src/html/edit.js b/packages/block-library/src/html/edit.js
@@ -3,8 +3,11 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import { BlockControls, PlainText } from '@wordpress/block-editor';
-import { transformStyles } from '@wordpress/editor';
+import {
+	BlockControls,
+	PlainText,
+	__experimentalTransformStyles,
+} from '@wordpress/block-editor';
 import { Disabled, SandBox } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
 
@@ -35,7 +38,7 @@ class HTMLEdit extends Component {
 
 		this.setState( { styles: [
 			defaultStyles,
-			...transformStyles( styles ),
+			...__experimentalTransformStyles( styles ),
 		] } );
 	}
 

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -11,15 +11,14 @@ import { compose } from '@wordpress/compose';
 import { Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { BlockEditorProvider } from '@wordpress/block-editor';
+import { BlockEditorProvider, __experimentalTransformStyles } from '@wordpress/block-editor';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
-import transformStyles from '../../editor-styles';
 import { mediaUpload } from '../../utils';
 import ReusableBlocksButtons from '../reusable-blocks-buttons';
 
@@ -111,7 +110,7 @@ class EditorProvider extends Component {
 			return;
 		}
 
-		const updatedStyles = transformStyles( this.props.settings.styles, '.editor-styles-wrapper' );
+		const updatedStyles = __experimentalTransformStyles( this.props.settings.styles, '.editor-styles-wrapper' );
 
 		map( updatedStyles, ( updatedCSS ) => {
 			if ( updatedCSS ) {

diff --git a/packages/editor/src/index.js b/packages/editor/src/index.js
@@ -17,4 +17,8 @@ import './hooks';
 
 export * from './components';
 export * from './utils';
-export { default as transformStyles } from './editor-styles';
+
+/*
+ * Backward compatibility
+ */
+export { __experimentalTransformStyles as transformStyles } from '@wordpress/block-editor';