@wordpress/env 11.0.1-next.v.0 → 11.0.1-next.v.202602091733.0

package/lib/runtime/docker/wordpress.js

@@ -47,20 +47,6 @@ function isWPMajorMinorVersionLower( version, compareVersion ) {
 	return versionNumber < compareVersionNumber;
 }
 
-/**
- * Checks a WordPress database connection. An error is thrown if the test is
- * unsuccessful.
- *
- * @param {WPConfig} config The wp-env config object.
- */
-async function checkDatabaseConnection( { dockerComposeConfigPath, debug } ) {
-	await dockerCompose.run( 'cli', 'wp db check', {
-		config: dockerComposeConfigPath,
-		commandOptions: [ '--rm' ],
-		log: debug,
-	} );
-}
-
 /**
  * Configures WordPress for the given environment by installing WordPress,
  * activating all plugins, and activating the first theme. These steps are
@@ -316,7 +302,6 @@ async function copyCoreFiles( fromPath, toPath ) {
 }
 
 module.exports = {
-	checkDatabaseConnection,
 	configureWordPress,
 	resetDatabase,
 	setupWordPressDirectories,

package/lib/runtime/errors.js

@@ -12,6 +12,17 @@ class UnsupportedCommandError extends Error {
 	}
 }
 
+/**
+ * Error thrown when the environment has not been initialized.
+ */
+class EnvironmentNotInitializedError extends Error {
+	constructor() {
+		super( 'Environment not initialized. Run `wp-env start` first.' );
+		this.name = 'EnvironmentNotInitializedError';
+	}
+}
+
 module.exports = {
 	UnsupportedCommandError,
+	EnvironmentNotInitializedError,
 };

package/lib/runtime/index.js

@@ -1,17 +1,17 @@
 'use strict';
 
-/**
- * External dependencies
- */
-const { existsSync } = require( 'fs' );
-const path = require( 'path' );
-
 /**
  * Internal dependencies
  */
 const DockerRuntime = require( './docker' );
 const PlaygroundRuntime = require( './playground' );
-const { UnsupportedCommandError } = require( './errors' );
+const {
+	UnsupportedCommandError,
+	EnvironmentNotInitializedError,
+} = require( './errors' );
+const { setCache, getCache } = require( '../cache' );
+
+const RUNTIME_CACHE_KEY = 'runtime';
 
 const runtimes = {
 	docker: DockerRuntime,
@@ -42,28 +42,50 @@ function getAvailableRuntimes() {
 }
 
 /**
- * Detect which runtime was used based on files in the work directory.
- * Returns 'playground' if playground-blueprint.json exists, otherwise 'docker'.
+ * Save the runtime type to the cache file.
+ * Called when start command initializes the environment.
+ *
+ * @param {string} runtimeName       The runtime name ('docker' or 'playground').
+ * @param {string} workDirectoryPath Path to the wp-env work directory.
+ */
+async function saveRuntime( runtimeName, workDirectoryPath ) {
+	await setCache( RUNTIME_CACHE_KEY, runtimeName, { workDirectoryPath } );
+}
+
+/**
+ * Get the saved runtime type from cache.
+ *
+ * @param {string} workDirectoryPath Path to the wp-env work directory.
+ * @return {Promise<string|undefined>} The saved runtime name, or undefined if not set.
+ */
+async function getSavedRuntime( workDirectoryPath ) {
+	return await getCache( RUNTIME_CACHE_KEY, { workDirectoryPath } );
+}
+
+/**
+ * Detect which runtime was used by reading from the cache.
+ * Throws EnvironmentNotInitializedError if no runtime has been saved.
  *
  * @param {string} workDirectoryPath Path to the wp-env work directory.
- * @return {string} Runtime name ('docker' or 'playground').
+ * @return {Promise<string>} Runtime name ('docker' or 'playground').
+ * @throws {EnvironmentNotInitializedError} If environment not initialized.
  */
-function detectRuntime( workDirectoryPath ) {
-	const playgroundBlueprintFile = path.join(
-		workDirectoryPath,
-		'playground-blueprint.json'
-	);
-	if ( existsSync( playgroundBlueprintFile ) ) {
-		return 'playground';
+async function detectRuntime( workDirectoryPath ) {
+	const savedRuntime = await getSavedRuntime( workDirectoryPath );
+	if ( ! savedRuntime ) {
+		throw new EnvironmentNotInitializedError();
 	}
-	return 'docker';
+	return savedRuntime;
 }
 
 module.exports = {
 	getRuntime,
 	getAvailableRuntimes,
 	detectRuntime,
+	saveRuntime,
+	getSavedRuntime,
 	DockerRuntime,
 	PlaygroundRuntime,
 	UnsupportedCommandError,
+	EnvironmentNotInitializedError,
 };

package/lib/runtime/playground/blueprint-builder.js

@@ -107,21 +107,13 @@ function getMountArgs( config ) {
 	}
 
 	// Mount themes
+	// All theme types (local, git, zip) can be mounted after downloading/extraction
 	for ( const theme of envConfig.themeSources || [] ) {
-		if ( theme.type === 'local' || theme.type === 'git' ) {
-			args.push(
-				'--mount-dir',
-				theme.path,
-				`/wordpress/wp-content/themes/${ theme.basename }`
-			);
-		} else {
-			throw new Error(
-				`Theme source "${ theme.basename || theme.path }" of type "${
-					theme.type
-				}" ` +
-					`is not supported with Playground runtime. Only local and git themes are supported.`
-			);
-		}
+		args.push(
+			'--mount-dir',
+			theme.path,
+			`/wordpress/wp-content/themes/${ theme.basename }`
+		);
 	}
 
 	// Mount custom mappings

package/lib/runtime/playground/index.js

@@ -75,6 +75,15 @@ class PlaygroundRuntime {
 		return 'WARNING! This will remove the WordPress Playground environment and all local files.';
 	}
 
+	/**
+	 * Get the warning message for cleanup confirmation.
+	 *
+	 * @return {string} Warning message.
+	 */
+	getCleanupWarningMessage() {
+		return 'WARNING! This will remove the WordPress Playground environment and all local files.';
+	}
+
 	/**
 	 * Start the WordPress Playground environment.
 	 *
@@ -350,6 +359,25 @@ class PlaygroundRuntime {
 		spinner.text = 'Removed WordPress Playground environment.';
 	}
 
+	/**
+	 * Cleanup the WordPress Playground environment.
+	 *
+	 * For Playground, cleanup is the same as destroy since there are no
+	 * shared resources like Docker images to preserve.
+	 *
+	 * @param {Object} config          The wp-env config object.
+	 * @param {Object} options         Cleanup options.
+	 * @param {Object} options.spinner A CLI spinner which indicates progress.
+	 */
+	async cleanup( config, { spinner } ) {
+		await this.stop( config, { spinner } );
+
+		spinner.text = 'Removing local files.';
+		await rimraf( config.workDirectoryPath );
+
+		spinner.text = 'Cleaned up WordPress Playground environment.';
+	}
+
 	/**
 	 * Run a command in the Playground environment.
 	 *
@@ -367,21 +395,21 @@ class PlaygroundRuntime {
 	}
 
 	/**
-	 * Clean/reset the WordPress database.
+	 * Reset the WordPress database.
 	 *
 	 * @param {Object}  config          The wp-env config object.
-	 * @param {Object}  options         Clean options.
+	 * @param {Object}  options         Reset options.
 	 * @param {Object}  options.spinner A CLI spinner which indicates progress.
 	 * @param {boolean} options.debug   True if debug mode is enabled.
 	 */
 	async clean( config, { spinner, debug } ) {
-		spinner.text = 'Cleaning WordPress Playground environment.';
+		spinner.text = 'Resetting WordPress Playground environment.';
 
 		// For Playground, we restart the server to reset the database
 		await this.stop( config, { spinner } );
 		await this.start( config, { spinner, debug } );
 
-		spinner.text = 'Cleaned WordPress Playground environment.';
+		spinner.text = 'Reset WordPress Playground environment.';
 	}
 
 	/**

package/lib/test/build-docker-compose-config.js

@@ -131,4 +131,87 @@ describe( 'buildDockerComposeConfig', () => {
 		expect( dockerConfig.volumes.wordpress ).toBe( undefined );
 		expect( dockerConfig.volumes[ 'tests-wordpress' ] ).toBe( undefined );
 	} );
+
+	it( 'should add healthcheck to mysql services', () => {
+		const config = buildDockerComposeConfig( {
+			workDirectoryPath: '/some/path',
+			env: {
+				development: {
+					port: 8888,
+					mysqlPort: 3306,
+					coreSource: null,
+					pluginSources: [],
+					themeSources: [],
+					mappings: {},
+				},
+				tests: {
+					port: 8889,
+					mysqlPort: 3307,
+					coreSource: null,
+					pluginSources: [],
+					themeSources: [],
+					mappings: {},
+				},
+			},
+		} );
+
+		expect( config.services.mysql.healthcheck ).toBeDefined();
+		expect( config.services.mysql.healthcheck.test ).toEqual( [
+			'CMD',
+			'healthcheck.sh',
+			'--connect',
+			'--innodb_initialized',
+		] );
+		expect( config.services.mysql.healthcheck.interval ).toBe( '5s' );
+		expect( config.services.mysql.healthcheck.timeout ).toBe( '10s' );
+		expect( config.services.mysql.healthcheck.retries ).toBe( 12 );
+		expect( config.services.mysql.healthcheck.start_period ).toBe( '60s' );
+
+		// Verify MARIADB_AUTO_UPGRADE is set for existing installations
+		expect( config.services.mysql.environment.MARIADB_AUTO_UPGRADE ).toBe(
+			'1'
+		);
+
+		expect( config.services[ 'tests-mysql' ].healthcheck ).toBeDefined();
+		expect( config.services[ 'tests-mysql' ].healthcheck.test ).toEqual( [
+			'CMD',
+			'healthcheck.sh',
+			'--connect',
+			'--innodb_initialized',
+		] );
+		expect(
+			config.services[ 'tests-mysql' ].environment.MARIADB_AUTO_UPGRADE
+		).toBe( '1' );
+	} );
+
+	it( 'should use service_healthy condition for WordPress depends_on', () => {
+		const config = buildDockerComposeConfig( {
+			workDirectoryPath: '/some/path',
+			env: {
+				development: {
+					port: 8888,
+					mysqlPort: 3306,
+					coreSource: null,
+					pluginSources: [],
+					themeSources: [],
+					mappings: {},
+				},
+				tests: {
+					port: 8889,
+					mysqlPort: 3307,
+					coreSource: null,
+					pluginSources: [],
+					themeSources: [],
+					mappings: {},
+				},
+			},
+		} );
+
+		expect( config.services.wordpress.depends_on ).toEqual( {
+			mysql: { condition: 'service_healthy' },
+		} );
+		expect( config.services[ 'tests-wordpress' ].depends_on ).toEqual( {
+			'tests-mysql': { condition: 'service_healthy' },
+		} );
+	} );
 } );

package/lib/test/cli.js

@@ -19,8 +19,11 @@ jest.mock( '../env', () => {
 	return {
 		start: jest.fn( Promise.resolve.bind( Promise ) ),
 		stop: jest.fn( Promise.resolve.bind( Promise ) ),
+		reset: jest.fn( Promise.resolve.bind( Promise ) ),
 		clean: jest.fn( Promise.resolve.bind( Promise ) ),
 		run: jest.fn( Promise.resolve.bind( Promise ) ),
+		destroy: jest.fn( Promise.resolve.bind( Promise ) ),
+		cleanup: jest.fn( Promise.resolve.bind( Promise ) ),
 		ValidationError: actual.ValidationError,
 		LifecycleScriptError: actual.LifecycleScriptError,
 	};
@@ -41,26 +44,33 @@ describe( 'env cli', () => {
 		expect( spinner.text ).toBe( '' );
 	} );
 
-	it( 'parses clean commands for the default environment.', () => {
-		cli().parse( [ 'clean' ] );
-		const { environment, spinner } = env.clean.mock.calls[ 0 ][ 0 ];
+	it( 'parses reset commands for the default environment.', () => {
+		cli().parse( [ 'reset' ] );
+		const { environment, spinner } = env.reset.mock.calls[ 0 ][ 0 ];
 		expect( environment ).toBe( 'tests' );
 		expect( spinner.text ).toBe( '' );
 	} );
-	it( 'parses clean commands for all environments.', () => {
-		cli().parse( [ 'clean', 'all' ] );
-		const { environment, spinner } = env.clean.mock.calls[ 0 ][ 0 ];
+	it( 'parses reset commands for all environments.', () => {
+		cli().parse( [ 'reset', 'all' ] );
+		const { environment, spinner } = env.reset.mock.calls[ 0 ][ 0 ];
 		expect( environment ).toBe( 'all' );
 		expect( spinner.text ).toBe( '' );
 	} );
-	it( 'parses clean commands for the development environment.', () => {
-		cli().parse( [ 'clean', 'development' ] );
-		const { environment, spinner } = env.clean.mock.calls[ 0 ][ 0 ];
+	it( 'parses reset commands for the development environment.', () => {
+		cli().parse( [ 'reset', 'development' ] );
+		const { environment, spinner } = env.reset.mock.calls[ 0 ][ 0 ];
 		expect( environment ).toBe( 'development' );
 		expect( spinner.text ).toBe( '' );
 	} );
-	it( 'parses clean commands for the tests environment.', () => {
-		cli().parse( [ 'clean', 'tests' ] );
+	it( 'parses reset commands for the tests environment.', () => {
+		cli().parse( [ 'reset', 'tests' ] );
+		const { environment, spinner } = env.reset.mock.calls[ 0 ][ 0 ];
+		expect( environment ).toBe( 'tests' );
+		expect( spinner.text ).toBe( '' );
+	} );
+
+	it( 'parses clean (deprecated) commands for the default environment.', () => {
+		cli().parse( [ 'clean' ] );
 		const { environment, spinner } = env.clean.mock.calls[ 0 ][ 0 ];
 		expect( environment ).toBe( 'tests' );
 		expect( spinner.text ).toBe( '' );
@@ -81,6 +91,32 @@ describe( 'env cli', () => {
 		expect( spinner.text ).toBe( '' );
 	} );
 
+	it( 'parses destroy commands.', () => {
+		cli().parse( [ 'destroy' ] );
+		const { spinner, scripts, force } = env.destroy.mock.calls[ 0 ][ 0 ];
+		expect( spinner.text ).toBe( '' );
+		expect( scripts ).toBe( true );
+		expect( force ).toBe( false );
+	} );
+	it( 'parses destroy commands with --force flag.', () => {
+		cli().parse( [ 'destroy', '--force' ] );
+		const { force } = env.destroy.mock.calls[ 0 ][ 0 ];
+		expect( force ).toBe( true );
+	} );
+
+	it( 'parses cleanup commands.', () => {
+		cli().parse( [ 'cleanup' ] );
+		const { spinner, scripts, force } = env.cleanup.mock.calls[ 0 ][ 0 ];
+		expect( spinner.text ).toBe( '' );
+		expect( scripts ).toBe( true );
+		expect( force ).toBe( false );
+	} );
+	it( 'parses cleanup commands with --force flag.', () => {
+		cli().parse( [ 'cleanup', '--force' ] );
+		const { force } = env.cleanup.mock.calls[ 0 ][ 0 ];
+		expect( force ).toBe( true );
+	} );
+
 	it( 'handles successful commands with messages.', async () => {
 		env.start.mockResolvedValueOnce( 'success message' );
 		cli().parse( [ 'start' ] );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "11.0.1-next.v.0+5aba098fc",
+	"version": "11.0.1-next.v.202602091733.0+daa0b19c4",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -64,5 +64,5 @@
 	"scripts": {
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
-	"gitHead": "d730f9e00f5462d1b9d2660632850f5f43ccff44"
+	"gitHead": "74f59922b25e30904319373dda91bf8e81f3544e"
 }