Update changelog, move phpunit-wp-config back to exec

packages/env/CHANGELOG.md

@@ -5,11 +5,16 @@
 ### Breaking Changes
 
 -   The `config` and `mappings` options in `.wp-env.json` are now merged with any overrides instead of being overwritten.
+-   The first listed theme is no longer activated when running wp-env start, since this overwrote whatever theme the user manually activated.
 
 ### New Feature
 
 -   You may now specify specific configuration for different environments using `env.tests` or `env.development` in `.wp-env.json`.
 
+### Bug Fixes
+
+-   `wp-env start` performance is now 2x faster after first install.
+
 ## 1.6.0-rc.0 (2020-06-24)
 
 -   `wp-env destroy` now removes dangling docker volumes and networks associated with the WordPress environment.

packages/env/lib/wordpress.js

@@ -116,15 +116,6 @@ async function configureWordPress( environment, config, spinner ) {
 		setupCommands.push( `wp plugin activate ${ pluginSource.basename }` );
 	}
 
-	// Since wp-phpunit loads wp-settings.php at the end of its wp-config.php
-	// file, we need to avoid loading it too early in our own wp-config.php. If
-	// we load it too early, then some things (like MULTISITE) will be defined
-	// before wp-phpunit has a chance to configure them. To avoid this, create a
-	// copy of wp-config.php for phpunit which doesn't require wp-settings.php.
-	setupCommands.push(
-		'sed "/^require.*wp-settings.php/d" /var/www/html/wp-config.php > /var/www/html/phpunit-wp-config.php'
-	);
-
 	if ( config.debug ) {
 		spinner.info(
 			`Running the following setup commands on the ${ environment } instance:\n - ${ setupCommands.join(
@@ -137,6 +128,24 @@ async function configureWordPress( environment, config, spinner ) {
 	await dockerRun( [ 'bash', '-c', setupCommands.join( ' && ' ) ], {
 		commandOptions: [ '--rm' ],
 	} );
+
+	// Since wp-phpunit loads wp-settings.php at the end of its wp-config.php
+	// file, we need to avoid loading it too early in our own wp-config.php. If
+	// we load it too early, then some things (like MULTISITE) will be defined
+	// before wp-phpunit has a chance to configure them. To avoid this, create a
+	// copy of wp-config.php for phpunit which doesn't require wp-settings.php.
+	await dockerCompose.exec(
+		environment === 'development' ? 'wordpress' : 'tests-wordpress',
+		[
+			'sh',
+			'-c',
+			'sed "/^require.*wp-settings.php/d" /var/www/html/wp-config.php > /var/www/html/phpunit-wp-config.php',
+		],
+		{
+			config: config.dockerComposeConfigPath,
+			log: config.debug,
+		}
+	);
 }
 
 /**