use async/await instead of promises

blocks/api/parser.js

@@ -366,14 +366,13 @@ export function createBlockWithFallback( blockNode ) {
  * @return {Function} An implementation which parses the post content.
  */
 export const createParse = ( parseImplementation ) =>
-	( content ) => parseImplementation( content )
-		.then( ( parsed ) => parsed.reduce( ( memo, blockNode ) => {
-			const block = createBlockWithFallback( blockNode );
-			if ( block ) {
-				memo.push( block );
-			}
-			return memo;
-		}, [] ) );
+	async ( content ) => ( await parseImplementation( content ) ).reduce( ( memo, blockNode ) => {
+		const block = createBlockWithFallback( blockNode );
+		if ( block ) {
+			memo.push( block );
+		}
+		return memo;
+	}, [] );
 
 /**
  * Parses the post content with a PegJS grammar and returns a list of blocks.

blocks/api/post-parser.js

@@ -1,3 +1,3 @@
 import { parse as syncParse } from './post.pegjs';
 
-export const parse = ( document ) => Promise.resolve( syncParse( document ) );
+export const parse = ( postContent ) => Promise.resolve( syncParse( postContent ) );

editor/components/block-drop-zone/index.js

@@ -51,12 +51,12 @@ class BlockDropZone extends Component {
 		}
 	}
 
-	onHTMLDrop( HTML, position ) {
-		rawHandler( { HTML, mode: 'BLOCKS' } ).then( ( blocks ) => {
-			if ( blocks.length ) {
-				this.props.insertBlocks( blocks, this.getInsertIndex( position ) );
-			}
-		} );
+	async onHTMLDrop( HTML, position ) {
+		const blocks = await rawHandler( { HTML, mode: 'BLOCKS' } );
+
+		if ( blocks.length ) {
+			this.props.insertBlocks( blocks, this.getInsertIndex( position ) );
+		}
 	}
 
 	onDrop( event, position ) {

editor/components/block-list/invalid-block-warning.js

@@ -3,13 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
-import {
-	getBlockType,
-	createBlock,
-	rawHandler,
-} from '@wordpress/blocks';
+import { createBlock, getBlockType, rawHandler } from '@wordpress/blocks';
 import { withDispatch } from '@wordpress/data';
-
 /**
  * Internal dependencies
  */
@@ -44,11 +39,11 @@ export default withDispatch( ( dispatch, { block } ) => {
 				content: block.originalContent,
 			} ) );
 		},
-		convertToBlocks() {
-			rawHandler( {
+		async convertToBlocks() {
+			replaceBlock( block.uid, await rawHandler( {
 				HTML: block.originalContent,
 				mode: 'BLOCKS',
-			} ).then( ( content ) => replaceBlock( block.uid, content ) );
+			} ) );
 		},
 	};
 } )( InvalidBlockWarning );

editor/components/block-settings-menu/block-html-convert-button.js

@@ -21,10 +21,13 @@ export default compose(
 		};
 	} ),
 	withDispatch( ( dispatch, { block, canUserUseUnfilteredHTML } ) => ( {
-		onClick: () => rawHandler( {
-			HTML: getBlockContent( block ),
-			mode: 'BLOCKS',
-			canUserUseUnfilteredHTML,
-		} ).then( ( content ) => dispatch( 'core/editor' ).replaceBlocks( block.uid, content ) ),
+		onClick: async () => dispatch( 'core/editor' ).replaceBlocks(
+			block.uid,
+			await rawHandler( {
+				HTML: getBlockContent( block ),
+				mode: 'BLOCKS',
+				canUserUseUnfilteredHTML,
+			} )
+		),
 	} ) ),
 )( BlockConvertButton );

editor/components/block-settings-menu/block-unknown-convert-button.js

@@ -21,13 +21,13 @@ export default compose(
 		};
 	} ),
 	withDispatch( ( dispatch, { block, canUserUseUnfilteredHTML } ) => ( {
-		onClick: () => dispatch( 'core/editor' ).replaceBlocks(
+		onClick: async () => dispatch( 'core/editor' ).replaceBlocks(
 			block.uid,
-			rawHandler( {
+			( await rawHandler( {
 				HTML: serialize( block ),
 				mode: 'BLOCKS',
 				canUserUseUnfilteredHTML,
-			} )
+			} ) )
 		),
 	} ) ),
 )( BlockConvertButton );

editor/components/post-text-editor/index.js

@@ -116,11 +116,9 @@ export default compose( [
 			onChange( content ) {
 				editPost( { content } );
 			},
-			onPersist( content ) {
-				parse( content ).then( ( blocks ) => {
-					resetBlocks( blocks );
-					checkTemplateValidity();
-				} );
+			async onPersist( content ) {
+				resetBlocks( await parse( content ) );
+				checkTemplateValidity();
 			},
 		};
 	} ),

editor/components/rich-text/index.js

@@ -258,7 +258,7 @@ export class RichText extends Component {
 	 *
 	 * @param {PasteEvent} event The paste event as triggered by TinyMCE.
 	 */
-	onPaste( event ) {
+	async onPaste( event ) {
 		const dataTransfer =
 			event.clipboardData ||
 			event.dataTransfer ||
@@ -275,27 +275,27 @@ export class RichText extends Component {
 		// Note: a pasted file may have the URL as plain text.
 		if ( item && ! HTML ) {
 			const file = item.getAsFile ? item.getAsFile() : item;
-			rawHandler( {
+			const content = await rawHandler( {
 				HTML: `<img src="${ createBlobURL( file ) }">`,
 				mode: 'BLOCKS',
 				tagName: this.props.tagName,
-			} ).then( ( content ) => {
-				const shouldReplace = this.props.onReplace && this.isEmpty();
+			} );
 
-				// Allows us to ask for this information when we get a report.
-				window.console.log( 'Received item:\n\n', file );
-
-				if ( shouldReplace ) {
-					// Necessary to allow the paste bin to be removed without errors.
-					this.props.setTimeout( () => this.props.onReplace( content ) );
-				} else if ( this.props.onSplit ) {
-					// Necessary to get the right range.
-					// Also done in the TinyMCE paste plugin.
-					this.props.setTimeout( () => this.splitContent( content ) );
-				}
+			const shouldReplace = this.props.onReplace && this.isEmpty();
 
-				event.preventDefault();
-			} );
+			// Allows us to ask for this information when we get a report.
+			window.console.log( 'Received item:\n\n', file );
+
+			if ( shouldReplace ) {
+				// Necessary to allow the paste bin to be removed without errors.
+				this.props.setTimeout( () => this.props.onReplace( content ) );
+			} else if ( this.props.onSplit ) {
+				// Necessary to get the right range.
+				// Also done in the TinyMCE paste plugin.
+				this.props.setTimeout( () => this.splitContent( content ) );
+			}
+
+			event.preventDefault();
 		}
 
 		this.pastedPlainText = plainText;
@@ -312,7 +312,7 @@ export class RichText extends Component {
 	 * @param {PrePasteProcessEvent} event The PrePasteProcess event as triggered
 	 *                                     by TinyMCE.
 	 */
-	onPastePreProcess( event ) {
+	async onPastePreProcess( event ) {
 		const HTML = this.isPlainTextPaste ? '' : event.content;
 
 		event.preventDefault();
@@ -350,27 +350,27 @@ export class RichText extends Component {
 			mode = 'AUTO';
 		}
 
-		rawHandler( {
+		const content = await rawHandler( {
 			HTML,
 			plainText: this.pastedPlainText,
 			mode,
 			tagName: this.props.tagName,
 			canUserUseUnfilteredHTML: this.props.canUserUseUnfilteredHTML,
-		} ).then( ( content ) => {
-			if ( typeof content === 'string' ) {
-				this.editor.insertContent( content );
-			} else if ( this.props.onSplit ) {
-				if ( ! content.length ) {
-					return;
-				}
+		} );
 
-				if ( shouldReplace ) {
-					this.props.onReplace( content );
-				} else {
-					this.splitContent( content, { paste: true } );
-				}
+		if ( typeof content === 'string' ) {
+			this.editor.insertContent( content );
+		} else if ( this.props.onSplit ) {
+			if ( ! content.length ) {
+				return;
 			}
-		} );
+
+			if ( shouldReplace ) {
+				this.props.onReplace( content );
+			} else {
+				this.splitContent( content, { paste: true } );
+			}
+		}
 	}
 
 	/**