chore: Use ESLint comma-dangle with always-multiline

.eslintrc.json

@@ -33,6 +33,7 @@
 	"rules": {
 		"array-bracket-spacing": [ "error", "always" ],
 		"brace-style": [ "error", "1tbs" ],
+		"comma-dangle": ["error", "always-multiline"],
 		"comma-spacing": "error",
 		"comma-style": "error",
 		"computed-property-spacing": [ "error", "always" ],

blocks/api/categories.js

@@ -5,7 +5,7 @@
  * @var {Array} categories
  */
 const categories = [
-	{ slug: 'common', title: 'Common' }
+	{ slug: 'common', title: 'Common' },
 ];
 
 /**

blocks/api/factory.js

@@ -20,7 +20,7 @@ export function createBlock( blockType, attributes = {} ) {
 	return {
 		uid: uuid(),
 		blockType,
-		attributes
+		attributes,
 	};
 }
 
@@ -48,6 +48,6 @@ export function switchToBlockType( block, blockType ) {
 	return Object.assign( {
 		uid: block.uid,
 		attributes: transformation.transform( block.attributes ),
-		blockType
+		blockType,
 	} );
 }

blocks/api/index.js

@@ -14,5 +14,5 @@ export {
 	setUnknownTypeHandler,
 	getUnknownTypeHandler,
 	getBlockSettings,
-	getBlocks
+	getBlocks,
 } from './registration';

blocks/api/test/factory.js

@@ -20,12 +20,12 @@ describe( 'block factory', () => {
 	describe( 'createBlock()', () => {
 		it( 'should create a block given its blockType and attributes', () => {
 			const block = createBlock( 'core/test-block', {
-				align: 'left'
+				align: 'left',
 			} );
 
 			expect( block.blockType ).to.eql( 'core/test-block' );
 			expect( block.attributes ).to.eql( {
-				align: 'left'
+				align: 'left',
 			} );
 			expect( block.uid ).to.be.a( 'string' );
 		} );
@@ -39,20 +39,20 @@ describe( 'block factory', () => {
 						blocks: [ 'core/text-block' ],
 						transform: ( { value } ) => {
 							return {
-								value: 'chicken ' + value
+								value: 'chicken ' + value,
 							};
-						}
-					} ]
-				}
+						},
+					} ],
+				},
 			} );
 			registerBlock( 'core/text-block', {} );
 
 			const block = {
 				uid: 1,
 				blockType: 'core/text-block',
 				attributes: {
-					value: 'ribs'
-				}
+					value: 'ribs',
+				},
 			};
 
 			const updateBlock = switchToBlockType( block, 'core/updated-text-block' );
@@ -61,8 +61,8 @@ describe( 'block factory', () => {
 				uid: 1,
 				blockType: 'core/updated-text-block',
 				attributes: {
-					value: 'chicken ribs'
-				}
+					value: 'chicken ribs',
+				},
 			} );
 		} );
 
@@ -74,19 +74,19 @@ describe( 'block factory', () => {
 						blocks: [ 'core/updated-text-block' ],
 						transform: ( { value } ) => {
 							return {
-								value: 'chicken ' + value
+								value: 'chicken ' + value,
 							};
-						}
-					} ]
-				}
+						},
+					} ],
+				},
 			} );
 
 			const block = {
 				uid: 1,
 				blockType: 'core/text-block',
 				attributes: {
-					value: 'ribs'
-				}
+					value: 'ribs',
+				},
 			};
 
 			const updateBlock = switchToBlockType( block, 'core/updated-text-block' );
@@ -95,8 +95,8 @@ describe( 'block factory', () => {
 				uid: 1,
 				blockType: 'core/updated-text-block',
 				attributes: {
-					value: 'chicken ribs'
-				}
+					value: 'chicken ribs',
+				},
 			} );
 		} );
 
@@ -108,8 +108,8 @@ describe( 'block factory', () => {
 				uid: 1,
 				blockType: 'core/text-block',
 				attributes: {
-					value: 'ribs'
-				}
+					value: 'ribs',
+				},
 			};
 
 			const updateBlock = switchToBlockType( block, 'core/updated-text-block' );

blocks/api/test/parser.js

@@ -33,27 +33,27 @@ describe( 'block parser', () => {
 			const blockSettings = {
 				attributes: function( rawContent ) {
 					return {
-						content: rawContent + ' & Chicken'
+						content: rawContent + ' & Chicken',
 					};
-				}
+				},
 			};
 
 			expect( parseBlockAttributes( 'Ribs', blockSettings ) ).to.eql( {
-				content: 'Ribs & Chicken'
+				content: 'Ribs & Chicken',
 			} );
 		} );
 
 		it( 'should use the query object implementation', () => {
 			const blockSettings = {
 				attributes: {
-					emphasis: text( 'strong' )
-				}
+					emphasis: text( 'strong' ),
+				},
 			};
 
 			const rawContent = '<span>Ribs <strong>& Chicken</strong></span>';
 
 			expect( parseBlockAttributes( rawContent, blockSettings ) ).to.eql( {
-				emphasis: '& Chicken'
+				emphasis: '& Chicken',
 			} );
 		} );
 
@@ -70,12 +70,12 @@ describe( 'block parser', () => {
 			const blockSettings = {
 				attributes: function( rawContent ) {
 					return {
-						content: rawContent + ' & Chicken'
+						content: rawContent + ' & Chicken',
 					};
 				},
 				defaultAttributes: {
-					topic: 'none'
-				}
+					topic: 'none',
+				},
 			};
 
 			const rawContent = 'Ribs';
@@ -84,7 +84,7 @@ describe( 'block parser', () => {
 			expect( getBlockAttributes( blockSettings, rawContent, attrs ) ).to.eql( {
 				align: 'left',
 				topic: 'none',
-				content: 'Ribs & Chicken'
+				content: 'Ribs & Chicken',
 			} );
 		} );
 	} );
@@ -146,7 +146,7 @@ describe( 'block parser', () => {
 					return {
 						content: rawContent,
 					};
-				}
+				},
 			} );
 
 			const parsed = parse(
@@ -168,9 +168,9 @@ describe( 'block parser', () => {
 			registerBlock( 'core/test-block', {
 				attributes: function( rawContent ) {
 					return {
-						content: rawContent + ' & Chicken'
+						content: rawContent + ' & Chicken',
 					};
-				}
+				},
 			} );
 
 			const parsed = parse(
@@ -182,7 +182,7 @@ describe( 'block parser', () => {
 			expect( parsed ).to.have.lengthOf( 1 );
 			expect( parsed[ 0 ].blockType ).to.equal( 'core/test-block' );
 			expect( parsed[ 0 ].attributes ).to.eql( {
-				content: 'Ribs & Chicken'
+				content: 'Ribs & Chicken',
 			} );
 			expect( parsed[ 0 ].uid ).to.be.a( 'string' );
 		} );
@@ -215,7 +215,7 @@ describe( 'block parser', () => {
 					return {
 						content: rawContent,
 					};
-				}
+				},
 			} );
 
 			setUnknownTypeHandler( 'core/unknown-block' );

blocks/api/test/registration.js

@@ -15,7 +15,7 @@ import {
 	setUnknownTypeHandler,
 	getUnknownTypeHandler,
 	getBlockSettings,
-	getBlocks
+	getBlocks,
 } from '../registration';
 
 describe( 'blocks', () => {

blocks/api/test/serializer.js

@@ -66,9 +66,9 @@ describe( 'block serializer', () => {
 			const attributes = getCommentAttributes( {
 				fruit: 'bananas',
 				category: 'food',
-				ripeness: 'ripe'
+				ripeness: 'ripe',
 			}, {
-				fruit: 'bananas'
+				fruit: 'bananas',
 			} );
 
 			expect( attributes ).to.equal( 'category:food ripeness:ripe ' );
@@ -78,9 +78,9 @@ describe( 'block serializer', () => {
 			const attributes = getCommentAttributes( {
 				fruit: 'bananas',
 				category: 'food',
-				ripeness: undefined
+				ripeness: undefined,
 			}, {
-				fruit: 'bananas'
+				fruit: 'bananas',
 			} );
 
 			expect( attributes ).to.equal( 'category:food ' );
@@ -92,22 +92,22 @@ describe( 'block serializer', () => {
 			const blockSettings = {
 				attributes: ( rawContent ) => {
 					return {
-						content: rawContent
+						content: rawContent,
 					};
 				},
 				save( { attributes } ) {
 					return <p dangerouslySetInnerHTML={ { __html: attributes.content } } />;
-				}
+				},
 			};
 			registerBlock( 'core/test-block', blockSettings );
 			const blockList = [
 				{
 					blockType: 'core/test-block',
 					attributes: {
 						content: 'Ribs & Chicken',
-						align: 'left'
-					}
-				}
+						align: 'left',
+					},
+				},
 			];
 			const expectedPostContent = '<!-- wp:core/test-block align:left --><p>Ribs & Chicken</p><!-- /wp:core/test-block -->';
 

blocks/components/editable/format-toolbar.js

@@ -10,26 +10,26 @@ const FORMATTING_CONTROLS = [
 	{
 		icon: 'editor-bold',
 		title: wp.i18n.__( 'Bold' ),
-		format: 'bold'
+		format: 'bold',
 	},
 	{
 		icon: 'editor-italic',
 		title: wp.i18n.__( 'Italic' ),
-		format: 'italic'
+		format: 'italic',
 	},
 	{
 		icon: 'editor-strikethrough',
 		title: wp.i18n.__( 'Strikethrough' ),
-		format: 'strikethrough'
-	}
+		format: 'strikethrough',
+	},
 ];
 
 class FormatToolbar extends wp.element.Component {
 	constructor( props ) {
 		super( ...arguments );
 		this.state = {
 			linkValue: props.formats.link ? props.formats.link.value : '',
-			isEditingLink: false
+			isEditingLink: false,
 		};
 		this.addLink = this.addLink.bind( this );
 		this.editLink = this.editLink.bind( this );
@@ -46,7 +46,7 @@ class FormatToolbar extends wp.element.Component {
 
 	componentWillReceiveProps( nextProps ) {
 		const newState = {
-			linkValue: nextProps.formats.link ? nextProps.formats.link.value : ''
+			linkValue: nextProps.formats.link ? nextProps.formats.link.value : '',
 		};
 		if (
 			! this.props.formats.link ||
@@ -61,7 +61,7 @@ class FormatToolbar extends wp.element.Component {
 	toggleFormat( format ) {
 		return () => {
 			this.props.onChange( {
-				[ format ]: ! this.props.formats[ format ]
+				[ format ]: ! this.props.formats[ format ],
 			} );
 		};
 	}
@@ -82,21 +82,21 @@ class FormatToolbar extends wp.element.Component {
 	editLink( event ) {
 		event.preventDefault();
 		this.setState( {
-			isEditingLink: true
+			isEditingLink: true,
 		} );
 	}
 
 	submitLink( event ) {
 		event.preventDefault();
 		this.props.onChange( { link: { value: this.state.linkValue } } );
 		this.setState( {
-			isEditingLink: false
+			isEditingLink: false,
 		} );
 	}
 
 	updateLinkValue( event ) {
 		this.setState( {
-			linkValue: event.target.value
+			linkValue: event.target.value,
 		} );
 	}
 
@@ -114,13 +114,13 @@ class FormatToolbar extends wp.element.Component {
 							.map( ( control ) => ( {
 								...control,
 								onClick: this.toggleFormat( control.format ),
-								isActive: !! formats[ control.format ]
+								isActive: !! formats[ control.format ],
 							} ) )
 							.concat( [ {
 								icon: 'admin-links',
 								title: wp.i18n.__( 'Link' ),
 								onClick: this.addLink,
-								isActive: !! formats.link
+								isActive: !! formats.link,
 							} ] )
 					}
 				/>