Demo Sites: Ensure demo site uses WP version same as local site

src/hooks/tests/use-update-demo-site.test.tsx

@@ -12,6 +12,7 @@ jest.mock( '../../lib/get-ipc-api', () => ( {
 	getIpcApi: jest.fn().mockReturnValue( {
 		archiveSite: jest.fn().mockResolvedValue( { zipContent: new Blob( [ 'zipContent' ] ) } ),
 		showMessageBox: jest.fn().mockResolvedValue( { response: 1 } ), // Assuming '1' is the cancel button
+		getWpVersion: jest.fn().mockResolvedValue( '6.5' ),
 	} ),
 } ) );
 jest.mock( '@sentry/electron/renderer', () => ( {
@@ -90,6 +91,7 @@ describe( 'useUpdateDemoSite', () => {
 						type: 'application/zip',
 					} ),
 				],
+				[ 'wordpress_version', '6.5' ],
 			],
 		} );
 

src/hooks/use-archive-site.ts

@@ -89,6 +89,12 @@ export function useArchiveSite() {
 				type: 'application/zip',
 			} );
 
+			const formData = [ [ 'import', file ] ];
+			const wordpressVersion = await getIpcApi().getWpVersion( siteId );
+			if ( wordpressVersion.length >= 3 ) {
+				formData.push( [ 'wordpress_version', wordpressVersion ] );
+			}
+
 			try {
 				const response: {
 					atomic_site_id: number;
@@ -99,7 +105,7 @@ export function useArchiveSite() {
 				} = await client.req.post( {
 					path: '/jurassic-ninja/create-new-site-from-zip',
 					apiNamespace: 'wpcom/v2',
-					formData: [ [ 'import', file ] ],
+					formData,
 				} );
 				addSnapshot( {
 					url: response.domain_name,

src/hooks/use-get-wp-version.ts

@@ -4,7 +4,7 @@ import { getIpcApi } from '../lib/get-ipc-api';
 export function useGetWpVersion( site: SiteDetails ) {
 	const [ wpVersion, setWpVersion ] = useState( '-' );
 	useEffect( () => {
-		getIpcApi().getWpVersion( site.path ).then( setWpVersion );
-	}, [ site.path, site.running ] );
+		getIpcApi().getWpVersion( site.id ).then( setWpVersion );
+	}, [ site.id, site.running ] );
 	return wpVersion;
 }

src/hooks/use-update-demo-site.tsx

@@ -39,14 +39,21 @@ export const DemoSiteUpdateProvider: React.FC< DemoSiteUpdateProviderProps > = (
 				type: 'application/zip',
 			} );
 
+			const formData = [
+				[ 'site_id', snapshot.atomicSiteId ],
+				[ 'import', file ],
+			];
+
+			const wordpressVersion = await getIpcApi().getWpVersion( localSite.id );
+			if ( wordpressVersion.length >= 3 ) {
+				formData.push( [ 'wordpress_version', wordpressVersion ] );
+			}
+
 			try {
 				const response = await client.req.post( {
 					path: '/jurassic-ninja/update-site-from-zip',
 					apiNamespace: 'wpcom/v2',
-					formData: [
-						[ 'site_id', snapshot.atomicSiteId ],
-						[ 'import', file ],
-					],
+					formData,
 				} );
 				updateSnapshot( {
 					...snapshot,

src/ipc-handlers.ts

@@ -449,7 +449,12 @@ export async function getAppGlobals( _event: IpcMainInvokeEvent ): Promise< AppG
 	};
 }
 
-export async function getWpVersion( _event: IpcMainInvokeEvent, wordPressPath: string ) {
+export async function getWpVersion( _event: IpcMainInvokeEvent, id: string ) {
+	const server = SiteServer.get( id );
+	if ( ! server ) {
+		return '-';
+	}
+	const wordPressPath = server.details.path;
 	let versionFileContent = '';
 	try {
 		versionFileContent = fs.readFileSync(

src/preload.ts

@@ -29,7 +29,7 @@ const api: IpcApi = {
 	copyText: ( text: string ) => ipcRenderer.invoke( 'copyText', text ),
 	getAppGlobals: () => ipcRenderer.invoke( 'getAppGlobals' ),
 	removeTemporalFile: ( path: string ) => ipcRenderer.invoke( 'removeTemporalFile', path ),
-	getWpVersion: ( wordPressPath: string ) => ipcRenderer.invoke( 'getWpVersion', wordPressPath ),
+	getWpVersion: ( id: string ) => ipcRenderer.invoke( 'getWpVersion', id ),
 	generateProposedSitePath: ( siteName: string ) =>
 		ipcRenderer.invoke( 'generateProposedSitePath', siteName ),
 	openLocalPath: ( path: string ) => ipcRenderer.invoke( 'openLocalPath', path ),