Studio: Download the latest wp-cli and bundle it (#178)

* Studio: Download the latest wp-cli and bundle it * Studio: Remove copy and update functions
Automattic · May 29, 2024 · 547c532 · 547c532
1 parent ac6e72a
commit 547c532
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/scripts/download-wp-server-files.ts b/scripts/download-wp-server-files.ts
@@ -17,6 +17,12 @@ const FILES_TO_DOWNLOAD = [
 		description: 'SQLite files',
 		url: 'https://downloads.wordpress.org/plugin/sqlite-database-integration.zip',
 	},
+	{
+		name: 'wp-cli',
+		description: 'WP-CLI phar file',
+		url: 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
+		destinationPath: path.join( WP_SERVER_FILES_PATH, 'wp-cli' ),
+	},
 ];
 
 const downloadFile = async ( {
@@ -75,8 +81,13 @@ const downloadFile = async ( {
 		} );
 	} );
 
-	console.log( `[${ name }] Extracting files from zip ...` );
-	await extract( zipPath, { dir: extractedPath } );
+	if ( name === 'wp-cli' ) {
+		console.log( `[${ name }] Moving WP-CLI to destination ...` );
+		fs.moveSync( zipPath, path.join( extractedPath, 'wp-cli.phar' ), { overwrite: true } );
+	} else {
+		console.log( `[${ name }] Extracting files from zip ...` );
+		await extract( zipPath, { dir: extractedPath } );
+	}
 	console.log( `[${ name }] Files extracted` );
 };
 

diff --git a/src/setup-wp-server-files.ts b/src/setup-wp-server-files.ts
@@ -2,8 +2,9 @@ import path from 'path';
 import fs from 'fs-extra';
 import semver from 'semver';
 import { SQLITE_FILENAME } from '../vendor/wp-now/src/constants';
-import { getWordPressVersionPath } from '../vendor/wp-now/src/download';
+import { downloadWPCLI, getWordPressVersionPath } from '../vendor/wp-now/src/download';
 import getSqlitePath from '../vendor/wp-now/src/get-sqlite-path';
+import getWpCliPath from '../vendor/wp-now/src/get-wp-cli-path';
 import { recursiveCopyDirectory } from './lib/fs-utils';
 import { updateLatestSqliteVersion } from './lib/sqlite-versions';
 import {

diff --git a/vendor/wp-now/src/download.ts b/vendor/wp-now/src/download.ts
@@ -53,10 +53,11 @@ async function downloadFile({
 	url,
 	destinationFilePath,
 	itemName,
+	overwrite = false,
 }): Promise<DownloadFileAndUnzipResult> {
 	let statusCode = 0;
 	try {
-		if (fs.existsSync(destinationFilePath)) {
+		if (fs.existsSync(destinationFilePath) && !overwrite ) {
 			return { downloaded: false, statusCode: 0 };
 		}
 		fs.ensureDirSync(path.dirname(destinationFilePath));
@@ -90,11 +91,12 @@ async function downloadFile({
 	}
 }
 
-export async function downloadWPCLI() {
+export async function downloadWPCLI( overwrite = false ) {
 	return downloadFile({
 		url: WP_CLI_URL,
 		destinationFilePath: getWpCliPath(),
 		itemName: 'wp-cli',
+		overwrite,
 	});
 }
 

diff --git a/vendor/wp-now/src/get-wp-cli-path.ts b/vendor/wp-now/src/get-wp-cli-path.ts
@@ -1,13 +1,13 @@
 import path from 'path';
-import getWpNowPath from './get-wp-now-path';
 import getWpCliTmpPath from './get-wp-cli-tmp-path';
+import { getResourcesPath } from '../../../src/storage/paths';
 
 /**
  * The path for wp-cli phar file within the WP Now folder.
  */
 export default function getWpCliPath() {
 	if (process.env.NODE_ENV !== 'test') {
-		return path.join(getWpNowPath(), 'wp-cli.phar');
+	  return path.join( getResourcesPath(), 'wp-files', 'wp-cli', 'wp-cli.phar' );
 	}
 	return path.join(getWpCliTmpPath(), 'wp-cli.phar');
 }