eslint: Enable @wordpress/no-unused-vars-before-return rule

projects/js-packages/ai-client/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/js-packages/ai-client/src/jwt/index.ts

@@ -49,8 +49,6 @@ export default async function requestJwt( {
 	siteId = siteId || window.JP_CONNECTION_INITIAL_STATE.siteSuffix;
 	expirationTime = expirationTime || JWT_TOKEN_EXPIRATION_TIME;
 
-	const isSimple = isSimpleSite();
-
 	// Trying to pick the token from localStorage
 	const token = localStorage.getItem( JWT_TOKEN_ID );
 	let tokenData: TokenDataProps | null = null;
@@ -70,6 +68,7 @@ export default async function requestJwt( {
 
 	let data: TokenDataEndpointResponseProps;
 
+	const isSimple = isSimpleSite();
 	if ( ! isSimple ) {
 		data = await apiFetch( {
 			/*

projects/js-packages/ai-client/src/logo-generator/components/logo-presenter.tsx

@@ -188,6 +188,7 @@ export const LogoPresenter: React.FC< LogoPresenterProps > = ( {
 	logoAccepted = false,
 	siteId,
 } ) => {
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- @todo Start extending jetpack-js-tools/eslintrc/react in eslintrc, then we can remove this disable comment.
 	const { isRequestingImage } = useLogoGenerator();
 	const { saveToLibraryError, logoUpdateError } = useRequestErrors();
 

projects/js-packages/ai-client/src/logo-generator/components/prompt.tsx

@@ -102,13 +102,14 @@ export const Prompt: React.FC< { initialPrompt?: string } > = ( { initialPrompt
 	const onPromptPaste = ( event: React.ClipboardEvent< HTMLInputElement > ) => {
 		event.preventDefault();
 
-		// Paste plain text only
-		const text = event.clipboardData.getData( 'text/plain' );
-
 		const selection = window.getSelection();
 		if ( ! selection || ! selection.rangeCount ) {
 			return;
 		}
+
+		// Paste plain text only
+		const text = event.clipboardData.getData( 'text/plain' );
+
 		selection.deleteFromDocument();
 		const range = selection.getRangeAt( 0 );
 		range.insertNode( document.createTextNode( text ) );

projects/js-packages/i18n-check-webpack-plugin/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Add eslint-disable for a false positive of `@wordpress/no-unused-vars-before-return`.
+
+

projects/js-packages/i18n-check-webpack-plugin/src/I18nCheckPlugin.js

@@ -214,6 +214,7 @@ class I18nCheckPlugin {
 	 * @param {Map}                 moduleCache - Cache for processed modules.
 	 */
 	async #processAsset( compilation, filename, moduleCache ) {
+		// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- Grabbing current timestamp for timing.
 		const t0 = Date.now();
 		const asset = compilation.getAsset( filename );
 

projects/packages/backup/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/backup/src/js/components/backup-storage-space/storage-help-popover/index.jsx

@@ -14,12 +14,6 @@ const StorageHelpPopover = ( { className, forecastInDays } ) => {
 	const addonSlug = useSelect( select => select( STORE_ID ).getStorageAddonOfferSlug() );
 	const siteSlug = useSelect( select => select( STORE_ID ).getCalypsoSlug() );
 	const adminUrl = useSelect( select => select( STORE_ID ).getSiteData().adminUrl );
-	const storageUpgradeUrl = getProductCheckoutUrl(
-		addonSlug,
-		siteSlug,
-		`${ adminUrl }admin.php?page=jetpack-backup`,
-		true
-	);
 
 	const popover = useRef( null );
 
@@ -44,6 +38,13 @@ const StorageHelpPopover = ( { className, forecastInDays } ) => {
 		return null;
 	}
 
+	const storageUpgradeUrl = getProductCheckoutUrl(
+		addonSlug,
+		siteSlug,
+		`${ adminUrl }admin.php?page=jetpack-backup`,
+		true
+	);
+
 	const forecastStatement = sprintf(
 		/* translators: %d: is number of days of the forecast */
 		_n(

projects/packages/classic-theme-helper/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/classic-theme-helper/src/responsive-videos/responsive-videos.js

@@ -27,7 +27,6 @@ function responsiveVideos() {
 				video.style.margin = videoMargin;
 			}
 
-			const videoWidth = video.getAttribute( 'data-width' );
 			const videoHeight = video.getAttribute( 'data-height' );
 			const videoRatio = video.getAttribute( 'data-ratio' );
 			const containerWidth = video.parentElement.clientWidth;
@@ -41,6 +40,8 @@ function responsiveVideos() {
 				return;
 			}
 
+			const videoWidth = video.getAttribute( 'data-width' );
+
 			if ( parseInt( videoWidth, 10 ) > containerWidth ) {
 				video.style.width = containerWidth + 'px';
 				video.style.height = containerWidth * parseFloat( videoRatio ) + 'px';

projects/packages/forms/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/forms/src/blocks/contact-form/util/form-styles.js

@@ -40,13 +40,13 @@ window.jetpackForms.generateStyleVariables = function ( formNode ) {
 			</div>
 		`;
 
-	const _document = window[ 'editor-canvas' ] ? window[ 'editor-canvas' ].document : document;
-	const bodyNode = _document.querySelector( 'body' );
-
 	if ( ! formNode ) {
 		return;
 	}
 
+	const _document = window[ 'editor-canvas' ] ? window[ 'editor-canvas' ].document : document;
+	const bodyNode = _document.querySelector( 'body' );
+
 	const styleProbe = _document.createElement( 'div' );
 	styleProbe.className = STYLE_PROBE_CLASS;
 	styleProbe.style = STYLE_PROBE_STYLE;

projects/packages/forms/src/dashboard/inbox/response.js

@@ -32,16 +32,16 @@ const InboxResponse = ( { loading, response } ) => {
 		setTimeout( () => setEmailCopied( false ), 3000 );
 	}, [ response, setEmailCopied ] );
 
+	if ( ! loading && ! response ) {
+		return null;
+	}
+
 	const titleClasses = clsx( 'jp-forms__inbox-response-title', {
 		'is-email': response && ! response.author_name && response.author_email,
 		'is-ip': response && ! response.author_name && ! response.author_email,
 		'is-name': response && response.author_name,
 	} );
 
-	if ( ! loading && ! response ) {
-		return null;
-	}
-
 	return (
 		<SwitchTransition
 			ref={ ref }

projects/packages/jetpack-mu-wpcom/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Call `useState` instead of `React.useState` in one place, so it can be seen as a hook call by `@wordpress/no-unused-vars-before-return`. Should be the same function, just returned through `@wordpress/elements`.
+
+

projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/index.tsx

@@ -71,7 +71,7 @@ const SharingModalInner: React.FC = () => {
 	const [ isOpen, setIsOpen ] = useState( false );
 	const closeModal = () => setIsOpen( false );
 	const { createNotice } = useDispatch( noticesStore );
-	const [ shouldShowSuggestedTags, setShouldShowSuggestedTags ] = React.useState( true );
+	const [ shouldShowSuggestedTags, setShouldShowSuggestedTags ] = useState( true );
 
 	useEffect( () => {
 		// The first post will show a different modal.

projects/packages/masterbar/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/masterbar/src/admin-menu/admin-menu.js

@@ -8,14 +8,15 @@ import './admin-menu.css';
 	 */
 	function init() {
 		const adminbar = document.querySelector( '#wpadminbar' );
-		const wpwrap = document.querySelector( '#wpwrap' );
-		const adminMenu = document.querySelector( '#adminmenu' );
-		const dismissClass = 'dismissible-card__close-icon';
 
 		if ( ! adminbar ) {
 			return;
 		}
 
+		const wpwrap = document.querySelector( '#wpwrap' );
+		const adminMenu = document.querySelector( '#adminmenu' );
+		const dismissClass = 'dismissible-card__close-icon';
+
 		/**
 		 *
 		 * @param value

projects/packages/my-jetpack/_inc/components/redeem-token-screen/index.jsx

@@ -24,12 +24,12 @@ export default function RedeemTokenScreen() {
 		},
 	} );
 
-	const tokenRedeemed = includesLifetimePurchase( purchases );
-
 	if ( isLoading ) {
 		return <>{ __( 'Checking gold status…', 'jetpack-my-jetpack' ) }</>;
 	}
 
+	const tokenRedeemed = includesLifetimePurchase( purchases );
+
 	return (
 		<>
 			<GoldenTokenModal tokenRedeemed={ tokenRedeemed } displayName={ displayName } />

projects/packages/my-jetpack/_inc/utils/format-time.ts

@@ -1,8 +1,6 @@
 type FormatTimeFunction = ( hours: number ) => string;
 
 const formatTime: FormatTimeFunction = ( hours: number ) => {
-	const seconds = Math.floor( hours * 3600 );
-	const minutes = Math.floor( seconds / 60 );
 	hours = Math.floor( hours );
 	const days = Math.floor( hours / 24 );
 	const years = Math.floor( days / 365 );
@@ -15,6 +13,9 @@ const formatTime: FormatTimeFunction = ( hours: number ) => {
 		return `${ days }d ${ hours % 24 }h`;
 	}
 
+	const seconds = Math.floor( hours * 3600 );
+	const minutes = Math.floor( seconds / 60 );
+
 	if ( hours > 0 ) {
 		return `${ hours }h ${ minutes % 60 }m`;
 	}

projects/packages/my-jetpack/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/publicize/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/publicize/src/js/classic-editor-share-limits.js

@@ -2,7 +2,6 @@ import jQuery from 'jquery';
 
 jQuery( function ( $ ) {
 	const state = window.jetpackSocialClassicEditorInitialState ?? {};
-	const form = $( '#publicize-form' );
 
 	if ( ! state || state.sharesRemaining > state.numberOfConnections ) {
 		return;
@@ -20,6 +19,7 @@ jQuery( function ( $ ) {
 		return;
 	}
 
+	const form = $( '#publicize-form' );
 	form.click( function ( event ) {
 		const target = $( event.target );
 

projects/packages/search/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/search/src/dashboard/components/record-meter/notice-box.jsx

@@ -70,7 +70,6 @@ const getNotices = ( tierMaximumRecords = null ) => {
  */
 export function NoticeBox( props ) {
 	const activeNoticeIds = [];
-	const NOTICES = getNotices( props.tierMaximumRecords );
 
 	const DATA_NOT_VALID = '1',
 		HAS_NOT_BEEN_INDEXED = '2',
@@ -96,6 +95,7 @@ export function NoticeBox( props ) {
 		return null;
 	}
 
+	const NOTICES = getNotices( props.tierMaximumRecords );
 	const notice = NOTICES[ activeNoticeIds[ 0 ] ];
 
 	const noticeBoxClassName = notice.isImportant

projects/packages/search/src/instant-search/components/search-app.jsx

@@ -126,9 +126,6 @@ class SearchApp extends Component {
 	}
 
 	getResultFormat = () => {
-		// Override the result format from the query string if result_format= is specified
-		const resultFormatQuery = getResultFormatQuery();
-
 		// Override the result format if group static filter is selected, always use expanded.
 		const isMultiSite =
 			this.props.staticFilters &&
@@ -138,6 +135,8 @@ class SearchApp extends Component {
 			return RESULT_FORMAT_EXPANDED;
 		}
 
+		// Override the result format from the query string if result_format= is specified
+		const resultFormatQuery = getResultFormatQuery();
 		return resultFormatQuery || this.state.overlayOptions.resultFormat;
 	};
 

projects/packages/search/src/instant-search/components/search-results.jsx

@@ -49,7 +49,6 @@ class SearchResults extends Component {
 		const { total = 0, corrected_query = false } = this.props.response;
 		const hasQuery = this.props.searchQuery !== '';
 		const hasCorrectedQuery = corrected_query !== false;
-		const num = new Intl.NumberFormat().format( total );
 		const isMultiSite =
 			this.props.staticFilters &&
 			this.props.staticFilters.group_id &&
@@ -67,6 +66,7 @@ class SearchResults extends Component {
 			return __( 'No results found', 'jetpack-search-pkg' );
 		}
 
+		const num = new Intl.NumberFormat().format( total );
 		if ( hasQuery && hasCorrectedQuery ) {
 			return sprintf(
 				/* translators: %1$s: number of results. %2$s: the corrected search query. */

projects/packages/videopress/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
+
+

projects/packages/videopress/src/client/admin/components/admin-page/index.tsx

@@ -329,6 +329,7 @@ const UpgradeTrigger = ( { hasUsedVideo = false }: { hasUsedVideo: boolean } ) =
 	const { adminUri, siteSuffix } = window.jetpackVideoPressInitialState;
 
 	const { product, hasVideoPressPurchase, isFetchingPurchases } = usePlan();
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- @todo Start extending jetpack-js-tools/eslintrc/react in eslintrc, then we can remove this disable comment.
 	const { run } = useProductCheckoutWorkflow( {
 		siteSuffix,
 		productSlug: product.productSlug,
@@ -337,7 +338,13 @@ const UpgradeTrigger = ( { hasUsedVideo = false }: { hasUsedVideo: boolean } ) =
 		useBlogIdSuffix: true,
 	} );
 
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- @todo Start extending jetpack-js-tools/eslintrc/react in eslintrc, then we can remove this disable comment.
 	const { recordEventHandler } = useAnalyticsTracks( {} );
+
+	if ( hasVideoPressPurchase || isFetchingPurchases ) {
+		return null;
+	}
+
 	const onButtonClickHandler = recordEventHandler(
 		'jetpack_videopress_upgrade_trigger_link_click',
 		run
@@ -352,10 +359,6 @@ const UpgradeTrigger = ( { hasUsedVideo = false }: { hasUsedVideo: boolean } ) =
 		'jetpack-videopress-pkg'
 	);
 
-	if ( hasVideoPressPurchase || isFetchingPurchases ) {
-		return null;
-	}
-
 	return (
 		<ContextualUpgradeTrigger
 			description={ description }

projects/packages/videopress/src/client/admin/components/video-list/index.tsx

@@ -96,11 +96,10 @@ const VideoList = ( {
 						loading={ loading }
 						onSelect={ check =>
 							setSelected( current => {
-								const indexOf = current.indexOf( index );
-
 								if ( check ) {
 									return [ ...current, index ];
 								} else if ( ! check && indexOf > -1 ) {
+									const indexOf = current.indexOf( index );
 									return [ ...current.slice( 0, indexOf ), ...current.slice( indexOf + 1 ) ];
 								}
 

projects/packages/videopress/src/client/admin/components/video-storage-meter/index.tsx

@@ -59,6 +59,7 @@ const VideoStorageMeter: React.FC< VideoStorageMeterProps > = ( {
 
 export const ConnectVideoStorageMeter = props => {
 	const { storageUsed, uploadedVideoCount } = useVideos();
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- @todo Start extending jetpack-js-tools/eslintrc/react in eslintrc, then we can remove this disable comment.
 	const { features } = usePlan();
 	const { settings } = useVideoPressSettings();
 	const { siteType } = settings;