Refactor client/me to use import/order (#55190)

Automattic · Aug 24, 2021 · 5dd8b22 · 5dd8b22
1 parent 4dedccf
commit 5dd8b22
Show file tree

Hide file tree

Showing 253 changed files with 1,172 additions and 3,199 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -198,6 +198,7 @@ module.exports = {
 				'client/layout/**/*',
 				'client/login/**/*',
 				'client/mailing-lists/**/*',
+				'client/me/**/*',
 				'client/my-sites/**/*',
 				'client/notifications/**/*',
 				'client/post-editor/**/*',

diff --git a/client/me/account-close/closed.jsx b/client/me/account-close/closed.jsx
@@ -1,22 +1,12 @@
-/**
- * External dependencies
- */
-import React, { Component } from 'react';
 import { localize } from 'i18n-calypso';
-import { connect } from 'react-redux';
 import page from 'page';
-
-/**
- * Internal dependencies
- */
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
 import EmptyContent from 'calypso/components/empty-content';
 import Spinner from 'calypso/components/spinner';
 import getPreviousRoute from 'calypso/state/selectors/get-previous-route';
 import isAccountClosed from 'calypso/state/selectors/is-account-closed';
 
-/**
- * Style dependencies
- */
 import './closed.scss';
 
 class AccountSettingsClosedComponent extends Component {

diff --git a/client/me/account-close/confirm-dialog.jsx b/client/me/account-close/confirm-dialog.jsx
@@ -1,27 +1,17 @@
-/**
- * External dependencies
- */
-import React from 'react';
-import { localize } from 'i18n-calypso';
-import { connect } from 'react-redux';
-import page from 'page';
-
-/**
- * Internal dependencies
- */
 import { recordTracksEvent } from '@automattic/calypso-analytics';
 import { Dialog, Button } from '@automattic/components';
-import Gridicon from 'calypso/components/gridicon';
-import FormTextInput from 'calypso/components/forms/form-text-input';
+import { localize } from 'i18n-calypso';
+import page from 'page';
+import React from 'react';
+import { connect } from 'react-redux';
 import FormLabel from 'calypso/components/forms/form-label';
+import FormTextInput from 'calypso/components/forms/form-text-input';
+import Gridicon from 'calypso/components/gridicon';
 import InlineSupportLink from 'calypso/components/inline-support-link';
-import { getCurrentUser } from 'calypso/state/current-user/selectors';
 import { closeAccount } from 'calypso/state/account/actions';
+import { getCurrentUser } from 'calypso/state/current-user/selectors';
 import getOnboardingUrl from 'calypso/state/selectors/get-onboarding-url';
 
-/**
- * Style dependencies
- */
 import './confirm-dialog.scss';
 
 const noop = () => {};

diff --git a/client/me/account-close/controller.js b/client/me/account-close/controller.js
@@ -1,13 +1,6 @@
-/**
- * External dependencies
- */
 import React from 'react';
-
-/**
- * Internal dependencies
- */
-import AccountSettingsCloseComponent from 'calypso/me/account-close/main';
 import AccountSettingsClosedComponent from 'calypso/me/account-close/closed';
+import AccountSettingsCloseComponent from 'calypso/me/account-close/main';
 
 export function accountClose( context, next ) {
 	context.primary = React.createElement( AccountSettingsCloseComponent );

diff --git a/client/me/account-close/index.js b/client/me/account-close/index.js
@@ -1,15 +1,8 @@
-/**
- * External dependencies
- */
+import { isEnabled } from '@automattic/calypso-config';
 import page from 'page';
-
-/**
- * Internal dependencies
- */
-import { accountClose, accountClosed } from './controller';
 import { makeLayout, render as clientRender } from 'calypso/controller';
 import { sidebar } from 'calypso/me/controller';
-import { isEnabled } from '@automattic/calypso-config';
+import { accountClose, accountClosed } from './controller';
 
 export default function () {
 	if ( isEnabled( 'me/account-close' ) ) {

diff --git a/client/me/account-close/main.jsx b/client/me/account-close/main.jsx
@@ -1,43 +1,33 @@
-/**
- * External dependencies
- */
-import React, { Component, Fragment } from 'react';
-import page from 'page';
-import Gridicon from 'calypso/components/gridicon';
-import { localize } from 'i18n-calypso';
-import { connect } from 'react-redux';
+import { Button } from '@automattic/components';
 import classnames from 'classnames';
+import { localize } from 'i18n-calypso';
 import { map } from 'lodash';
-
-/**
- * Internal dependencies
- */
-import HeaderCake from 'calypso/components/header-cake';
+import page from 'page';
+import React, { Component, Fragment } from 'react';
+import { connect } from 'react-redux';
 import ActionPanel from 'calypso/components/action-panel';
 import ActionPanelBody from 'calypso/components/action-panel/body';
 import ActionPanelFigure from 'calypso/components/action-panel/figure';
 import ActionPanelFigureHeader from 'calypso/components/action-panel/figure-header';
 import ActionPanelFigureList from 'calypso/components/action-panel/figure-list';
 import ActionPanelFigureListItem from 'calypso/components/action-panel/figure-list-item';
-import ActionPanelLink from 'calypso/components/action-panel/link';
 import ActionPanelFooter from 'calypso/components/action-panel/footer';
-import { Button } from '@automattic/components';
+import ActionPanelLink from 'calypso/components/action-panel/link';
 import AccountCloseConfirmDialog from './confirm-dialog';
 import QueryUserPurchases from 'calypso/components/data/query-user-purchases';
-import { getCurrentUser } from 'calypso/state/current-user/selectors';
-import hasLoadedSites from 'calypso/state/selectors/has-loaded-sites';
-import getAccountClosureSites from 'calypso/state/selectors/get-account-closure-sites';
 import userHasAnyAtomicSites from 'calypso/state/selectors/user-has-any-atomic-sites';
 import isAccountClosed from 'calypso/state/selectors/is-account-closed';
 import { hasLoadedUserPurchasesFromServer } from 'calypso/state/purchases/selectors';
 import hasCancelableUserPurchases from 'calypso/state/selectors/has-cancelable-user-purchases';
 import getUserPurchasedPremiumThemes from 'calypso/state/selectors/get-user-purchased-premium-themes';
 import FormattedHeader from 'calypso/components/formatted-header';
+import Gridicon from 'calypso/components/gridicon';
+import HeaderCake from 'calypso/components/header-cake';
 import { redirectToLogout } from 'calypso/state/current-user/actions';
+import { getCurrentUser } from 'calypso/state/current-user/selectors';
+import getAccountClosureSites from 'calypso/state/selectors/get-account-closure-sites';
+import hasLoadedSites from 'calypso/state/selectors/has-loaded-sites';
 
-/**
- * Style dependencies
- */
 import './style.scss';
 
 class AccountSettingsClose extends Component {

diff --git a/client/me/account-password/index.jsx b/client/me/account-password/index.jsx
@@ -1,37 +1,26 @@
-/**
- * External dependencies
- */
-
+import classNames from 'classnames';
 import { localize } from 'i18n-calypso';
 import { debounce, flowRight as compose, isEmpty } from 'lodash';
 import React from 'react';
-import classNames from 'classnames';
 import { connect } from 'react-redux';
-
-/**
- * Internal dependencies
- */
-import { protectForm } from 'calypso/lib/protect-form';
+import FormButton from 'calypso/components/forms/form-button';
+import FormButtonsBar from 'calypso/components/forms/form-buttons-bar';
 import FormFieldset from 'calypso/components/forms/form-fieldset';
+import FormInputValidation from 'calypso/components/forms/form-input-validation';
 import FormLabel from 'calypso/components/forms/form-label';
 import FormPasswordInput from 'calypso/components/forms/form-password-input';
-import FormButton from 'calypso/components/forms/form-button';
-import FormButtonsBar from 'calypso/components/forms/form-buttons-bar';
 import FormSettingExplanation from 'calypso/components/forms/form-setting-explanation';
-import FormInputValidation from 'calypso/components/forms/form-input-validation';
-import { errorNotice } from 'calypso/state/notices/actions';
+import { generatePassword } from 'calypso/lib/generate-password';
+import { protectForm } from 'calypso/lib/protect-form';
+import wp from 'calypso/lib/wp';
 import { recordGoogleEvent } from 'calypso/state/analytics/actions';
+import { errorNotice } from 'calypso/state/notices/actions';
 import { saveUserSettings } from 'calypso/state/user-settings/actions';
 import {
 	hasUserSettingsRequestFailed,
 	isPendingPasswordChange,
 } from 'calypso/state/user-settings/selectors';
-import { generatePassword } from 'calypso/lib/generate-password';
-import wp from 'calypso/lib/wp';
 
-/**
- * Style dependencies
- */
 import './style.scss';
 
 class AccountPassword extends React.Component {

diff --git a/client/me/account/close-link.jsx b/client/me/account/close-link.jsx
@@ -1,14 +1,7 @@
-/**
- * External dependencies
- */
-import React from 'react';
-import { localize } from 'i18n-calypso';
-
 import { CompactCard } from '@automattic/components';
+import { localize } from 'i18n-calypso';
+import React from 'react';
 
-/**
- * Style dependencies
- */
 import './close-link.scss';
 
 const noop = () => {};

diff --git a/client/me/account/controller.js b/client/me/account/controller.js
@@ -1,16 +1,8 @@
-/**
- * External dependencies
- */
-
-import React from 'react';
-import page from 'page';
 import { translate } from 'i18n-calypso';
-
-/**
- * Internal dependencies
- */
-import { setDocumentHeadTitle as setTitle } from 'calypso/state/document-head/actions';
+import page from 'page';
+import React from 'react';
 import AccountComponent, { noticeId as meSettingsNoticeId } from 'calypso/me/account/main';
+import { setDocumentHeadTitle as setTitle } from 'calypso/state/document-head/actions';
 import { successNotice } from 'calypso/state/notices/actions';
 
 export function account( context, next ) {

diff --git a/client/me/account/index.js b/client/me/account/index.js
@@ -1,14 +1,7 @@
-/**
- * External dependencies
- */
 import page from 'page';
-
-/**
- * Internal dependencies
- */
-import { account } from './controller';
 import { makeLayout, render as clientRender } from 'calypso/controller';
 import { sidebar } from 'calypso/me/controller';
+import { account } from './controller';
 
 export default function () {
 	page( '/me/account', sidebar, account, makeLayout, clientRender );

diff --git a/client/me/account/main.jsx b/client/me/account/main.jsx
@@ -1,78 +1,71 @@
-/**
- * External dependencies
- */
-import React from 'react';
-import TransitionGroup from 'react-transition-group/TransitionGroup';
-import CSSTransition from 'react-transition-group/CSSTransition';
-import { localize } from 'i18n-calypso';
+import config from '@automattic/calypso-config';
+import { Card, Button } from '@automattic/components';
+import languages from '@automattic/languages';
 import debugFactory from 'debug';
 import emailValidator from 'email-validator';
+import { localize } from 'i18n-calypso';
 import { debounce, flowRight as compose, get, has, map, size } from 'lodash';
+import React from 'react';
 import { connect } from 'react-redux';
-
-/**
- * Internal dependencies
- */
+import CSSTransition from 'react-transition-group/CSSTransition';
+import TransitionGroup from 'react-transition-group/TransitionGroup';
+import ColorSchemePicker from 'calypso/blocks/color-scheme-picker';
+import FormButton from 'calypso/components/forms/form-button';
+import FormButtonsBar from 'calypso/components/forms/form-buttons-bar';
+import FormCheckbox from 'calypso/components/forms/form-checkbox';
+import FormTextValidation from 'calypso/components/forms/form-input-validation';
+import FormTextInput from 'calypso/components/forms/form-text-input';
 import LanguagePicker from 'calypso/components/language-picker';
+import Notice from 'calypso/components/notice';
 import SectionHeader from 'calypso/components/section-header';
 import MeSidebarNavigation from 'calypso/me/sidebar-navigation';
 import { protectForm } from 'calypso/lib/protect-form';
-import config from '@automattic/calypso-config';
-import languages from '@automattic/languages';
 import { supportsCssCustomProperties } from 'calypso/lib/feature-detection';
-import { Card, Button } from '@automattic/components';
-import FormTextInput from 'calypso/components/forms/form-text-input';
-import FormTextValidation from 'calypso/components/forms/form-input-validation';
-import FormCheckbox from 'calypso/components/forms/form-checkbox';
 import FormFieldset from 'calypso/components/forms/form-fieldset';
 import FormLabel from 'calypso/components/forms/form-label';
 import FormLegend from 'calypso/components/forms/form-legend';
 import FormSettingExplanation from 'calypso/components/forms/form-setting-explanation';
-import FormButton from 'calypso/components/forms/form-button';
-import FormButtonsBar from 'calypso/components/forms/form-buttons-bar';
 import FormSectionHeading from 'calypso/components/forms/form-section-heading';
 import FormRadio from 'calypso/components/forms/form-radio';
 import { recordGoogleEvent, recordTracksEvent, bumpStat } from 'calypso/state/analytics/actions';
 import ReauthRequired from 'calypso/me/reauth-required';
 import twoStepAuthorization from 'calypso/lib/two-step-authorization';
-import Notice from 'calypso/components/notice';
 import NoticeAction from 'calypso/components/notice/notice-action';
 import Main from 'calypso/components/main';
 import SitesDropdown from 'calypso/components/sites-dropdown';
-import ColorSchemePicker from 'calypso/blocks/color-scheme-picker';
-import { successNotice, errorNotice, removeNotice } from 'calypso/state/notices/actions';
-import { getLanguage, isLocaleVariant, canBeTranslated } from 'calypso/lib/i18n-utils';
-import isRequestingMissingSites from 'calypso/state/selectors/is-requesting-missing-sites';
-import getOnboardingUrl from 'calypso/state/selectors/get-onboarding-url';
-import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
-import canDisplayCommunityTranslator from 'calypso/state/selectors/can-display-community-translator';
-import { ENABLE_TRANSLATOR_KEY } from 'calypso/lib/i18n-utils/constants';
-import AccountSettingsCloseLink from './close-link';
-import { requestGeoLocation } from 'calypso/state/data-getters';
-import { withLocalizedMoment } from 'calypso/components/localized-moment';
 import {
 	getCurrentUserDate,
 	getCurrentUserDisplayName,
 	getCurrentUserName,
 	getCurrentUserVisibleSiteCount,
 } from 'calypso/state/current-user/selectors';
-import FormattedHeader from 'calypso/components/formatted-header';
-import wpcom from 'calypso/lib/wp';
-import { saveUnsavedUserSettings } from 'calypso/state/user-settings/thunks';
+import { requestGeoLocation } from 'calypso/state/data-getters';
+import { successNotice, errorNotice, removeNotice } from 'calypso/state/notices/actions';
+import { getLanguage, isLocaleVariant, canBeTranslated } from 'calypso/lib/i18n-utils';
+import { savePreference } from 'calypso/state/preferences/actions';
+import canDisplayCommunityTranslator from 'calypso/state/selectors/can-display-community-translator';
+import getOnboardingUrl from 'calypso/state/selectors/get-onboarding-url';
+import getUnsavedUserSettings from 'calypso/state/selectors/get-unsaved-user-settings';
+import getUserSettings from 'calypso/state/selectors/get-user-settings';
+import isNavUnificationEnabled from 'calypso/state/selectors/is-nav-unification-enabled';
+import isPendingEmailChange from 'calypso/state/selectors/is-pending-email-change';
+import isRequestingAllDomains from 'calypso/state/selectors/is-requesting-all-domains';
+import isRequestingMissingSites from 'calypso/state/selectors/is-requesting-missing-sites';
+import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
+import { ENABLE_TRANSLATOR_KEY } from 'calypso/lib/i18n-utils/constants';
 import {
 	cancelPendingEmailChange,
 	clearUnsavedUserSettings,
 	removeUnsavedUserSetting,
 	setUserSetting,
 } from 'calypso/state/user-settings/actions';
-import getUserSettings from 'calypso/state/selectors/get-user-settings';
-import getUnsavedUserSettings from 'calypso/state/selectors/get-unsaved-user-settings';
-import isPendingEmailChange from 'calypso/state/selectors/is-pending-email-change';
+import { saveUnsavedUserSettings } from 'calypso/state/user-settings/thunks';
+import AccountSettingsCloseLink from './close-link';
+import { withLocalizedMoment } from 'calypso/components/localized-moment';
+import FormattedHeader from 'calypso/components/formatted-header';
+import wpcom from 'calypso/lib/wp';
 import QueryUserSettings from 'calypso/components/data/query-user-settings';
-import isNavUnificationEnabled from 'calypso/state/selectors/is-nav-unification-enabled';
 import { clearStore } from 'calypso/lib/user/store';
-import { savePreference } from 'calypso/state/preferences/actions';
-import isRequestingAllDomains from 'calypso/state/selectors/is-requesting-all-domains';
 import { getFlatDomainsList } from 'calypso/state/sites/domains/selectors';
 import QueryAllDomains from 'calypso/components/data/query-all-domains';
 import { type as domainTypes } from 'calypso/lib/domains/constants';
@@ -82,9 +75,6 @@ const noticeOptions = {
 	id: noticeId,
 };
 
-/**
- * Style dependencies
- */
 import './style.scss';
 
 const colorSchemeKey = 'colorScheme';