@wordpress/env 8.12.0 → 9.0.0

package/lib/cli.js

@@ -58,10 +58,10 @@ const withSpinner =
 					'err' in error &&
 					'out' in error
 				) {
-					// Error is a docker-compose error. That means something docker-related failed.
+					// Error is a docker compose error. That means something docker-related failed.
 					// https://github.com/PDMLab/docker-compose/blob/HEAD/src/index.ts
 					spinner.fail(
-						'Error while running docker-compose command.'
+						'Error while running docker compose command.'
 					);
 					if ( error.out ) {
 						process.stdout.write( error.out );

package/lib/commands/clean.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 
 /**
  * Internal dependencies

package/lib/commands/destroy.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 const util = require( 'util' );
 const fs = require( 'fs' ).promises;
 const path = require( 'path' );

package/lib/commands/logs.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 
 /**
  * Internal dependencies

package/lib/commands/run.js

@@ -74,10 +74,13 @@ function spawnCommandDirectly( config, container, command, envCwd, spinner ) {
 		container === 'mysql' || container === 'tests-mysql'
 			? '/'
 			: '/var/www/html',
-		envCwd
+		// Remove spaces and single quotes from both ends of the path.
+		// This is needed because Windows treats single quotes as a literal character.
+		envCwd.trim().replace( /^'|'$/g, '' )
 	);
 
 	const composeCommand = [
+		'compose',
 		'-f',
 		config.dockerComposeConfigPath,
 		'exec',
@@ -98,7 +101,7 @@ function spawnCommandDirectly( config, container, command, envCwd, spinner ) {
 		// cannot use it to spawn an interactive command. Thus, we run docker-
 		// compose on the CLI directly.
 		const childProc = spawn(
-			'docker-compose',
+			'docker',
 			composeCommand,
 			{ stdio: 'inherit' },
 			spinner

package/lib/commands/start.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 const util = require( 'util' );
 const path = require( 'path' );
 const fs = require( 'fs' ).promises;

package/lib/commands/stop.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 
 /**
  * Internal dependencies

package/lib/test/cli.js

@@ -138,7 +138,7 @@ describe( 'env cli', () => {
 		await env.start.mock.results[ 0 ].value.catch( () => {} );
 
 		expect( spinner.fail ).toHaveBeenCalledWith(
-			'Error while running docker-compose command.'
+			'Error while running docker compose command.'
 		);
 		expect( process.stderr.write ).toHaveBeenCalledWith( 'failure error' );
 		expect( process.exit ).toHaveBeenCalledWith( 1 );

package/lib/wordpress.js

@@ -2,7 +2,7 @@
 /**
  * External dependencies
  */
-const dockerCompose = require( 'docker-compose' );
+const { v2: dockerCompose } = require( 'docker-compose' );
 const util = require( 'util' );
 const fs = require( 'fs' ).promises;
 const path = require( 'path' );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "8.12.0",
+	"version": "9.0.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -34,7 +34,7 @@
 	"dependencies": {
 		"chalk": "^4.0.0",
 		"copy-dir": "^1.3.0",
-		"docker-compose": "^0.22.2",
+		"docker-compose": "^0.24.3",
 		"extract-zip": "^1.6.7",
 		"got": "^11.8.5",
 		"inquirer": "^7.1.0",
@@ -51,5 +51,5 @@
 	"scripts": {
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
-	"gitHead": "839018ff6029ba749780e288e08ff9cd898e50e8"
+	"gitHead": "fcf61b4beff747222c2c81d09d757ca1a0abd925"
 }