Skip to content

Performance: Use bundled latest WordPress version in online mode #2364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan-ottinger merged 4 commits into from
Jan 9, 2026
Merged

Performance: Use bundled latest WordPress version in online mode #2364

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63ddc89
Use bundled latest WP version in online mode
ivan-ottinger Jan 8, 2026
47d07eb
Fix unit tests
ivan-ottinger Jan 8, 2026
d349481
Fix code formatting in site create test
ivan-ottinger Jan 8, 2026
15bc049
Refactor `createPathExistsMock` to set mock implementation internally
ivan-ottinger Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions cli/commands/site/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,28 +147,26 @@ export async function runCommand(

const isOnlineStatus = await isOnline();

if ( ! isOnlineStatus ) {
if ( options.wpVersion !== 'latest' ) {
throw new LoggerError(
__(
'Cannot set up WordPress while offline. Specific WordPress versions require an internet connection. Try using "latest" version or ensure internet connectivity.'
)
);
}

if ( options.wpVersion === 'latest' ) {
const bundledWPPath = path.join( getServerFilesPath(), 'wordpress-versions', 'latest' );

if ( ! ( await pathExists( bundledWPPath ) ) ) {
throw new LoggerError(
__(
'Cannot set up WordPress while offline. Bundled WordPress files not found. Please connect to the internet or reinstall Studio.'
'Cannot set up WordPress. Bundled WordPress files not found. Please connect to the internet or reinstall Studio.'
)
);
}

logger.reportStart( LoggerAction.SETUP_WORDPRESS, __( 'Copying bundled WordPress…' ) );
await recursiveCopyDirectory( bundledWPPath, sitePath );
logger.reportSuccess( __( 'WordPress files copied' ) );
} else if ( ! isOnlineStatus ) {
throw new LoggerError(
__(
'Cannot set up WordPress while offline. Specific WordPress versions require an internet connection. Try using "latest" version or ensure internet connectivity.'
)
);
}

if ( ! ( await isSqliteIntegrationAvailable() ) ) {
Expand Down
41 changes: 35 additions & 6 deletions cli/commands/site/tests/create.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import {
filterUnsupportedBlueprintFeatures,
validateBlueprintData,
} from 'common/lib/blueprint-validation';
import { isEmptyDir, isWordPressDirectory, pathExists, arePathsEqual } from 'common/lib/fs-utils';
import {
isEmptyDir,
isWordPressDirectory,
pathExists,
arePathsEqual,
recursiveCopyDirectory,
} from 'common/lib/fs-utils';
import { isOnline } from 'common/lib/network-utils';
import { portFinder } from 'common/lib/port-finder';
import {
Expand Down Expand Up @@ -94,15 +100,34 @@ describe( 'CLI: studio site create', () => {
let consoleLogSpy: jest.SpyInstance;
let fsMkdirSyncSpy: jest.SpyInstance;

const createPathExistsMock = ( sitePathExists = false ) => {
const bundledWPPath = require( 'path' ).join(
'/test/server-files',
'wordpress-versions',
'latest'
);
return jest.fn().mockImplementation( ( path: string ) => {
if ( path === bundledWPPath ) {
return Promise.resolve( true );
}
if ( path === mockSitePath ) {
return Promise.resolve( sitePathExists );
}
return Promise.resolve( false );
} );
};

beforeEach( () => {
jest.clearAllMocks();

consoleLogSpy = jest.spyOn( console, 'log' ).mockImplementation();
fsMkdirSyncSpy = jest.spyOn( require( 'fs' ), 'mkdirSync' ).mockReturnValue( undefined );
( pathExists as jest.Mock ).mockResolvedValue( false );
const pathExistsMock = createPathExistsMock( false );
( pathExists as jest.Mock ).mockImplementation( pathExistsMock );
( isEmptyDir as jest.Mock ).mockResolvedValue( true );
( isWordPressDirectory as jest.Mock ).mockReturnValue( false );
( arePathsEqual as jest.Mock ).mockImplementation( ( a, b ) => a === b );
( recursiveCopyDirectory as jest.Mock ).mockResolvedValue( undefined );
( portFinder.getOpenPort as jest.Mock ).mockResolvedValue( mockPort );
( readAppdata as jest.Mock ).mockResolvedValue( {
sites: [ ...mockAppdata.sites ],
Expand Down Expand Up @@ -598,7 +623,8 @@ describe( 'CLI: studio site create', () => {
} );

it( 'should delete site directory when server start fails for new directory', async () => {
( pathExists as jest.Mock ).mockResolvedValue( false );
const pathExistsMock = createPathExistsMock( false );
( pathExists as jest.Mock ).mockImplementation( pathExistsMock );
( isWordPressDirectory as jest.Mock ).mockReturnValue( false );
( startWordPressServer as jest.Mock ).mockRejectedValue( new Error( 'Server start failed' ) );

Expand All @@ -610,7 +636,8 @@ describe( 'CLI: studio site create', () => {
} );

it( 'should NOT delete site directory when server start fails for existing WordPress directory', async () => {
( pathExists as jest.Mock ).mockResolvedValue( true );
const pathExistsMock = createPathExistsMock( true );
( pathExists as jest.Mock ).mockImplementation( pathExistsMock );
( isEmptyDir as jest.Mock ).mockResolvedValue( false );
( isWordPressDirectory as jest.Mock ).mockReturnValue( true );
( startWordPressServer as jest.Mock ).mockRejectedValue( new Error( 'Server start failed' ) );
Expand All @@ -623,7 +650,8 @@ describe( 'CLI: studio site create', () => {
} );

it( 'should delete site directory when blueprint application fails for new directory', async () => {
( pathExists as jest.Mock ).mockResolvedValue( false );
const pathExistsMock = createPathExistsMock( false );
( pathExists as jest.Mock ).mockImplementation( pathExistsMock );
( isWordPressDirectory as jest.Mock ).mockReturnValue( false );
const testBlueprint = { steps: [] };
( runBlueprint as jest.Mock ).mockRejectedValue( new Error( 'Blueprint failed' ) );
Expand All @@ -645,7 +673,8 @@ describe( 'CLI: studio site create', () => {
} );

it( 'should NOT delete site directory when blueprint application fails for existing WordPress directory', async () => {
( pathExists as jest.Mock ).mockResolvedValue( true );
const pathExistsMock = createPathExistsMock( true );
( pathExists as jest.Mock ).mockImplementation( pathExistsMock );
( isEmptyDir as jest.Mock ).mockResolvedValue( false );
( isWordPressDirectory as jest.Mock ).mockReturnValue( true );
const testBlueprint = { steps: [] };
Expand Down