Skip to content

Commit

Permalink
Upgrade wp-prettier to 1.19.1 (#37568)
Browse files Browse the repository at this point in the history
* Reformat with old Prettier (update)

* Upgrade Prettier to 1.19.1

* Reformat with new Prettier
  • Loading branch information
jsnajdr authored Nov 13, 2019
1 parent f46b704 commit 1835f94
Show file tree
Hide file tree
Showing 579 changed files with 1,767 additions and 2,580 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,4 @@ export const TemplateSelectorControl = ( {
);
};

export default compose(
memo,
withInstanceId
)( TemplateSelectorControl );
export default compose( memo, withInstanceId )( TemplateSelectorControl );
5 changes: 1 addition & 4 deletions apps/notifications/src/panel/templates/button-back.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,4 @@ const mapDispatchToProps = {
unselectNote: actions.ui.unselectNote,
};

export default connect(
null,
mapDispatchToProps
)( localize( BackButton ) );
export default connect( null, mapDispatchToProps )( localize( BackButton ) );
5 changes: 1 addition & 4 deletions apps/notifications/src/panel/templates/button-edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,4 @@ EditButton.propTypes = {
translate: PropTypes.func.isRequired,
};

export default connect(
null,
{ editComment }
)( localize( EditButton ) );
export default connect( null, { editComment } )( localize( EditButton ) );
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,6 @@ const mapDispatchToProps = {
unselectNote: actions.ui.unselectNote,
};

export default connect(
mapStateToProps,
mapDispatchToProps,
null,
{ pure: false }
)( localize( CommentReplyInput ) );
export default connect( mapStateToProps, mapDispatchToProps, null, { pure: false } )(
localize( CommentReplyInput )
);
5 changes: 1 addition & 4 deletions apps/notifications/src/panel/templates/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,4 @@ const mapDispatchToProps = {
unselectNote: actions.ui.unselectNote,
};

export default connect(
mapStateToProps,
mapDispatchToProps
)( Layout );
export default connect( mapStateToProps, mapDispatchToProps )( Layout );
5 changes: 1 addition & 4 deletions apps/notifications/src/panel/templates/list-header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@ const mapDispatchToProps = {
viewSettings: actions.ui.viewSettings,
};

export default connect(
null,
mapDispatchToProps
)( ListHeader );
export default connect( null, mapDispatchToProps )( ListHeader );
9 changes: 3 additions & 6 deletions apps/notifications/src/panel/templates/note-list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,6 @@ const mapDispatchToProps = {
selectNote: actions.ui.selectNote,
};

export default connect(
mapStateToProps,
mapDispatchToProps,
null,
{ forwardRef: true }
)( localize( NoteList ) );
export default connect( mapStateToProps, mapDispatchToProps, null, { forwardRef: true } )(
localize( NoteList )
);
7 changes: 1 addition & 6 deletions apps/notifications/src/panel/templates/note.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,4 @@ const mapStateToProps = ( state, { note } ) => ( {
isRead: getIsNoteRead( state, note ),
} );

export default connect(
mapStateToProps,
null,
null,
{ forwardRef: true }
)( Note );
export default connect( mapStateToProps, null, null, { forwardRef: true } )( Note );
17 changes: 3 additions & 14 deletions apps/notifications/src/panel/templates/summary-in-list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,8 @@ export class SummaryInList extends React.Component {
}

const mapDispatchToProps = dispatch => ( {
selectNote: compose(
dispatch,
actions.ui.selectNote
),
unselectNote: compose(
dispatch,
actions.ui.unselectNote
),
selectNote: compose( dispatch, actions.ui.selectNote ),
unselectNote: compose( dispatch, actions.ui.unselectNote ),
} );

export default connect(
null,
mapDispatchToProps,
null,
{ pure: false }
)( SummaryInList );
export default connect( null, mapDispatchToProps, null, { pure: false } )( SummaryInList );
9 changes: 3 additions & 6 deletions apps/notifications/src/panel/templates/undo-list-item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,6 @@ const mapDispatchToProps = {
undoAction: actions.ui.undoAction,
};

export default connect(
mapStateToProps,
mapDispatchToProps,
null,
{ pure: false }
)( localize( UndoListItem ) );
export default connect( mapStateToProps, mapDispatchToProps, null, { pure: false } )(
localize( UndoListItem )
);
9 changes: 3 additions & 6 deletions client/auth/login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ export class Auth extends Component {
}
}

export default connect(
null,
{
recordGoogleEvent,
}
)( localize( Auth ) );
export default connect( null, {
recordGoogleEvent,
} )( localize( Auth ) );
5 changes: 1 addition & 4 deletions client/blocks/app-banner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,4 @@ const mapDispatchToProps = {
),
};

export default connect(
mapStateToProps,
mapDispatchToProps
)( localize( AppBanner ) );
export default connect( mapStateToProps, mapDispatchToProps )( localize( AppBanner ) );
5 changes: 1 addition & 4 deletions client/blocks/comments/comment-actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,4 @@ const mapDispatchToProps = ( dispatch, ownProps ) => {
};
};

export default connect(
null,
mapDispatchToProps
)( localize( CommentActions ) );
export default connect( null, mapDispatchToProps )( localize( CommentActions ) );
5 changes: 1 addition & 4 deletions client/blocks/comments/comment-edit-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,4 @@ PostCommentForm.defaultProps = {

const mapDispatchToProps = dispatch => bindActionCreators( { editComment }, dispatch );

export default connect(
null,
mapDispatchToProps
)( PostCommentForm );
export default connect( null, mapDispatchToProps )( PostCommentForm );
4 changes: 2 additions & 2 deletions client/blocks/disconnect-jetpack/docs/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class DisconnectJetpackDialogExample extends Component {

<p>
<Button onClick={ this.toggleVisibilityProfessional }>
Disconnect Professional Jetpack{' '}
Disconnect Professional Jetpack{ ' ' }
</Button>
</p>
<DisconnectJetpackDialog
Expand All @@ -81,7 +81,7 @@ class DisconnectJetpackDialogExample extends Component {

<p>
<Button onClick={ this.toggleVisibilityBroken }>
Disconnect Probably Broken Jetpack{' '}
Disconnect Probably Broken Jetpack{ ' ' }
</Button>
</p>
<DisconnectJetpackDialog
Expand Down
9 changes: 3 additions & 6 deletions client/blocks/dismissible-card/docs/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ function DismissibleCardExample( { clearPreference } ) {
);
}

const ConnectedDismissibleCardExample = connect(
null,
{
clearPreference: partial( savePreference, 'dismissible-card-example', null ),
}
)( DismissibleCardExample );
const ConnectedDismissibleCardExample = connect( null, {
clearPreference: partial( savePreference, 'dismissible-card-example', null ),
} )( DismissibleCardExample );

ConnectedDismissibleCardExample.displayName = 'DismissibleCard';

Expand Down
5 changes: 1 addition & 4 deletions client/blocks/dismissible-card/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ class DismissibleCard extends Component {
<Gridicon
icon="cross"
className="dismissible-card__close-icon"
onClick={ flow(
onClick,
dismissCard
) }
onClick={ flow( onClick, dismissCard ) }
/>
{ this.props.children }
</Card>
Expand Down
5 changes: 1 addition & 4 deletions client/blocks/gdpr-banner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,4 @@ const mapDispatchToProps = {
),
};

export default connect(
null,
mapDispatchToProps
)( GdprBanner );
export default connect( null, mapDispatchToProps )( GdprBanner );
9 changes: 3 additions & 6 deletions client/blocks/get-apps/apps-badge.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ export class AppsBadge extends PureComponent {
}
}

export default connect(
null,
{
recordTracksEvent,
}
)( localize( AppsBadge ) );
export default connect( null, {
recordTracksEvent,
} )( localize( AppsBadge ) );
5 changes: 1 addition & 4 deletions client/blocks/get-apps/desktop-download-card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,4 @@ const mapDispatchToProps = {
trackLinuxDebClick: () => recordTracksEvent( 'calypso_app_download_linux_deb_click' ),
};

export default connect(
null,
mapDispatchToProps
)( localize( DesktopDownloadCard ) );
export default connect( null, mapDispatchToProps )( localize( DesktopDownloadCard ) );
11 changes: 4 additions & 7 deletions client/blocks/global-notice/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ export class GlobalNotice extends Component {
}
}

export const InfoNotice = connect(
null,
{
displayNotice: infoNotice,
removeNotice,
}
)( GlobalNotice );
export const InfoNotice = connect( null, {
displayNotice: infoNotice,
removeNotice,
} )( GlobalNotice );
7 changes: 6 additions & 1 deletion client/blocks/image-selector/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ export class ImageSelectorPreview extends Component {
// already have the data for the media item, so first update the state
this.updateImageState( () => {
const { itemIds, siteId } = this.props;
if ( isEqual( this.state.images.map( image => image.ID ), itemIds ) ) {
if (
isEqual(
this.state.images.map( image => image.ID ),
itemIds
)
) {
return;
}

Expand Down
5 changes: 1 addition & 4 deletions client/blocks/inline-help/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,4 @@ const mapDispatchToProps = {
hideChecklistPrompt,
};

export default connect(
mapStateToProps,
mapDispatchToProps
)( localize( InlineHelp ) );
export default connect( mapStateToProps, mapDispatchToProps )( localize( InlineHelp ) );
5 changes: 1 addition & 4 deletions client/blocks/inline-help/inline-help-rich-result.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,4 @@ const mapDispatchToProps = {
openSupportArticleDialog,
};

export default connect(
mapStateToProps,
mapDispatchToProps
)( localize( InlineHelpRichResult ) );
export default connect( mapStateToProps, mapDispatchToProps )( localize( InlineHelpRichResult ) );
5 changes: 1 addition & 4 deletions client/blocks/inline-help/inline-help-search-card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,4 @@ const mapDispatchToProps = {
selectPreviousResult,
};

export default connect(
mapStateToProps,
mapDispatchToProps
)( localize( InlineHelpSearchCard ) );
export default connect( mapStateToProps, mapDispatchToProps )( localize( InlineHelpSearchCard ) );
5 changes: 1 addition & 4 deletions client/blocks/inline-help/popover.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,5 @@ const mapDispatchToProps = {

export default compose(
localize,
connect(
mapStateToProps,
mapDispatchToProps
)
connect( mapStateToProps, mapDispatchToProps )
)( InlineHelpPopover );
5 changes: 1 addition & 4 deletions client/blocks/jitm/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,4 @@ const mapDispatchToProps = dispatch => ( {
dispatch( dismissJetpackJITM( siteId, id, featureClass ) ),
} );

export default connect(
mapStateToProps,
mapDispatchToProps
)( JITM );
export default connect( mapStateToProps, mapDispatchToProps )( JITM );
5 changes: 1 addition & 4 deletions client/blocks/location-search/docs/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ class LocationSearchExample extends Component {
}
}

const ConnectedLocationSearchExample = connect(
null,
{ createNotice }
)( LocationSearchExample );
const ConnectedLocationSearchExample = connect( null, { createNotice } )( LocationSearchExample );
ConnectedLocationSearchExample.displayName = 'LocationSearch';
export default ConnectedLocationSearchExample;
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,8 @@ class SecurityKeyForm extends Component {
}
}

export default connect(
null,
{
formUpdate,
loginUserWithSecurityKey,
recordTracksEvent,
}
)( localize( SecurityKeyForm ) );
export default connect( null, {
formUpdate,
loginUserWithSecurityKey,
recordTracksEvent,
} )( localize( SecurityKeyForm ) );
5 changes: 1 addition & 4 deletions client/blocks/nps-survey/docs/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@ const mapDispatchToProp = {
successNotice,
};

const ConnectedNpsSurveyExample = connect(
mapStateToProps,
mapDispatchToProp
)( NpsSurveyExample );
const ConnectedNpsSurveyExample = connect( mapStateToProps, mapDispatchToProp )( NpsSurveyExample );

ConnectedNpsSurveyExample.displayName = 'NpsSurvey';

Expand Down
17 changes: 7 additions & 10 deletions client/blocks/nps-survey/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,10 @@ const mapStateToProps = state => {
};
};

export default connect(
mapStateToProps,
{
submitNpsSurvey,
submitNpsSurveyWithNoScore,
sendNpsSurveyFeedback,
successNotice,
recordTracksEvent,
}
)( localize( NpsSurvey ) );
export default connect( mapStateToProps, {
submitNpsSurvey,
submitNpsSurveyWithNoScore,
sendNpsSurveyFeedback,
successNotice,
recordTracksEvent,
} )( localize( NpsSurvey ) );
5 changes: 1 addition & 4 deletions client/blocks/privacy-policy-banner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,7 @@ const mapDispatchToProps = {
};

export default compose(
connect(
mapStateToProps,
mapDispatchToProps
),
connect( mapStateToProps, mapDispatchToProps ),
withLocalizedMoment,
localize
)( PrivacyPolicyBanner );
2 changes: 1 addition & 1 deletion client/blocks/product-selector/docs/example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const products = [
title: 'Jetpack Backup',
description: (
<Fragment>
Always-on backups ensure you never lose your site. Choose from real-time or daily backups.{' '}
Always-on backups ensure you never lose your site. Choose from real-time or daily backups.{ ' ' }
<a href="https://jetpack.com/upgrade/backup/" target="_blank" rel="noopener noreferrer">
Which one do I need?
</a>
Expand Down
Loading

0 comments on commit 1835f94

Please sign in to comment.