chore: small adjustments

src/components/content-tab-settings.tsx

@@ -31,7 +31,6 @@ export function ContentTabSettings( { selectedSite }: ContentTabSettingsProps )
 	const storedPassword = decodePassword( selectedSite.adminPassword ?? '' );
 	const password = storedPassword === '' ? 'password' : storedPassword;
 	const [ wpVersion, refreshWpVersion ] = useGetWpVersion( selectedSite );
-
 	const domain = selectedSite.customDomain
 		? `${ selectedSite.customDomain }`
 		: `localhost:${ selectedSite.port }`;

src/components/wp-version-selector/add-wp-version-to-list.ts

@@ -12,7 +12,6 @@ export const addWpVersionToList = ( newOption: Option, options: Option[] ): Opti
 
 	const firstOlderVersionIndex = options.findIndex( ( compareVersion ) => {
 		const compareVer = semver.coerce( compareVersion.value );
-
 		return compareVer && semver.gt( currentVer, compareVer );
 	} );
 

src/components/wp-version-selector/index.tsx

@@ -12,13 +12,13 @@ import { DEFAULT_WORDPRESS_VERSION } from 'vendor/wp-now/src/constants';
 import { addWpVersionToList } from './add-wp-version-to-list';
 
 type WPVersionSelectorProps = {
-	siteWpVersion?: string;
-
 	selectedValue: string;
 	onChange: ( version: string ) => void;
 	errorMessage?: string | null;
 	disabled?: boolean;
+	// Is used if you want to add a custom option to the list, for example the current version of a site
 	extraOptions?: { label: string; value: string }[];
+	/** Fallback options shown when available versions couldn't be fetched */
 	fallbackOptions: { label: string; value: string }[];
 };
 
@@ -31,7 +31,6 @@ export const WPVersionSelector = ( {
 	fallbackOptions,
 }: WPVersionSelectorProps ) => {
 	const { __ } = useI18n();
-
 	const isOffline = useOffline();
 	const offlineMessage = __( 'Changing WordPress version requires an internet connection.' );
 	const { data: wpVersions = [] } = useGetWordPressVersions();
@@ -42,10 +41,8 @@ export const WPVersionSelector = ( {
 	let stableVersions: { label: string; value: string }[] = wpVersions.filter(
 		( version ) => ! version.isBeta && ! version.isDevelopment && version.value !== 'latest'
 	);
-
 	extraOptions?.forEach( ( extraOption ) => {
 		const alreadyExists = wpVersions.some( ( version ) => version.value === extraOption.value );
-
 		if ( alreadyExists ) {
 			return;
 		}

src/hooks/use-add-site.ts

@@ -97,7 +97,6 @@ export function useAddSite() {
 			if ( useCustomDomain && ! customDomain ) {
 				usedCustomDomain = generateCustomDomainFromSiteName( siteName ?? '' );
 			}
-
 			await createSite(
 				path,
 				siteName ?? '',

src/modules/site-settings/edit-site-details.tsx

@@ -43,18 +43,15 @@ export default function EditSiteDetails( { currentWpVersion, onSave }: EditSiteD
 	const [ selectedPhpVersion, setSelectedPhpVersion ] = useState< AllowedPHPVersion >(
 		( selectedSite?.phpVersion as AllowedPHPVersion ) ?? DEFAULT_PHP_VERSION
 	);
-
-	const getAdjustedWpVersion = useCallback(
+	const getEffectiveWpVersion = useCallback(
 		() =>
 			// undefined means that this site was created before the isWpAutoUpdating option was introduced to Studio
 			[ undefined, true ].includes( selectedSite?.isWpAutoUpdating )
 				? DEFAULT_WORDPRESS_VERSION
 				: currentWpVersion,
 		[ selectedSite, currentWpVersion ]
 	);
-
-	const [ selectedWpVersion, setSelectedWpVersion ] = useState( getAdjustedWpVersion() );
-
+	const [ selectedWpVersion, setSelectedWpVersion ] = useState( getEffectiveWpVersion() );
 	const [ useCustomDomain, setUseCustomDomain ] = useState( Boolean( selectedSite?.customDomain ) );
 	const [ customDomain, setCustomDomain ] = useState< string | null >(
 		selectedSite?.customDomain ?? null
@@ -83,7 +80,7 @@ export default function EditSiteDetails( { currentWpVersion, onSave }: EditSiteD
 		!! selectedSite &&
 		selectedSite.name === siteName &&
 		selectedSite.phpVersion === selectedPhpVersion &&
-		getAdjustedWpVersion() === selectedWpVersion &&
+		getEffectiveWpVersion() === selectedWpVersion &&
 		Boolean( selectedSite.customDomain ) === useCustomDomain &&
 		usedCustomDomain === customDomain &&
 		!! selectedSite.enableHttps === ( !! usedCustomDomain && enableHttps );
@@ -96,13 +93,13 @@ export default function EditSiteDetails( { currentWpVersion, onSave }: EditSiteD
 		}
 		setSiteName( selectedSite.name );
 		setSelectedPhpVersion( selectedSite.phpVersion as AllowedPHPVersion );
-		setSelectedWpVersion( getAdjustedWpVersion() );
+		setSelectedWpVersion( getEffectiveWpVersion() );
 		setUseCustomDomain( Boolean( selectedSite.customDomain ) );
 		setCustomDomain( selectedSite.customDomain ?? null );
 		setCustomDomainError( '' );
 		setErrorUpdatingWpVersion( null );
 		setEnableHttps( selectedSite.enableHttps ?? false );
-	}, [ selectedSite, getAdjustedWpVersion ] );
+	}, [ selectedSite, getEffectiveWpVersion ] );
 
 	const onSiteEdit = async ( event: FormEvent ) => {
 		event.preventDefault();
@@ -112,7 +109,7 @@ export default function EditSiteDetails( { currentWpVersion, onSave }: EditSiteD
 		setIsEditingSite( true );
 		setErrorUpdatingWpVersion( null );
 
-		const hasWpVersionChanged = selectedWpVersion !== getAdjustedWpVersion();
+		const hasWpVersionChanged = selectedWpVersion !== getEffectiveWpVersion();
 		const hasPhpVersionChanged = selectedPhpVersion !== selectedSite.phpVersion;
 		const needsRestart = selectedSite.running && ( hasWpVersionChanged || hasPhpVersionChanged );
 		setNeedsRestart( needsRestart );
@@ -140,7 +137,7 @@ export default function EditSiteDetails( { currentWpVersion, onSave }: EditSiteD
 						title: __( 'Error changing WordPress version' ),
 						message: errorMessage,
 					} );
-					setSelectedWpVersion( getAdjustedWpVersion() );
+					setSelectedWpVersion( getEffectiveWpVersion() );
 					setIsEditingSite( false );
 					return;
 				}

src/site-server.ts

@@ -70,6 +70,7 @@ function getAbsoluteUrl( details: SiteDetails ): string {
 	return `http://localhost:${ details.port }`;
 }
 
+// We use SiteDetails for storing it in appdata-v1.json, so this meta was introduced for extra data which is not stored locally
 type SiteServerMeta = {
 	wpVersion?: string;
 };

vendor/wp-now/src/execute-wp-cli.ts

@@ -48,6 +48,7 @@ export async function executeWPCli(
 
 	//Set the SAPI name to cli before running the script
 	await php.setSapiName( 'cli' );
+
 	await prepareWordPress( php, options );
 
 	php.mkdir( '/tmp' );