@wordpress/env 4.8.0 → 4.9.0

package/lib/cli.js

@@ -22,57 +22,61 @@ const wpRed = boldWhite.bgHex( '#d94f4f' );
 const wpYellow = boldWhite.bgHex( '#f0b849' );
 
 // Spinner.
-const withSpinner = ( command ) => ( ...args ) => {
-	const spinner = ora().start();
-	args[ 0 ].spinner = spinner;
-	let time = process.hrtime();
-	return command( ...args ).then(
-		( message ) => {
-			time = process.hrtime( time );
-			spinner.succeed(
-				`${ message || spinner.text } (in ${ time[ 0 ] }s ${ (
-					time[ 1 ] / 1e6
-				).toFixed( 0 ) }ms)`
-			);
-			process.exit( 0 );
-		},
-		( error ) => {
-			if ( error instanceof env.ValidationError ) {
-				// Error is a validation error. That means the user did something wrong.
-				spinner.fail( error.message );
-				process.exit( 1 );
-			} else if (
-				error &&
-				typeof error === 'object' &&
-				'exitCode' in error &&
-				'err' in error &&
-				'out' in error
-			) {
-				// 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.' );
-				if ( error.out ) {
-					process.stdout.write( error.out );
-				}
-				if ( error.err ) {
-					process.stderr.write( error.err );
-				}
-				process.exit( error.exitCode );
-			} else if ( error ) {
-				// Error is an unknown error. That means there was a bug in our code.
-				spinner.fail(
-					typeof error === 'string' ? error : error.message
+const withSpinner =
+	( command ) =>
+	( ...args ) => {
+		const spinner = ora().start();
+		args[ 0 ].spinner = spinner;
+		let time = process.hrtime();
+		return command( ...args ).then(
+			( message ) => {
+				time = process.hrtime( time );
+				spinner.succeed(
+					`${ message || spinner.text } (in ${ time[ 0 ] }s ${ (
+						time[ 1 ] / 1e6
+					).toFixed( 0 ) }ms)`
 				);
-				// Disable reason: Using console.error() means we get a stack trace.
-				console.error( error );
-				process.exit( 1 );
-			} else {
-				spinner.fail( 'An unknown error occured.' );
-				process.exit( 1 );
+				process.exit( 0 );
+			},
+			( error ) => {
+				if ( error instanceof env.ValidationError ) {
+					// Error is a validation error. That means the user did something wrong.
+					spinner.fail( error.message );
+					process.exit( 1 );
+				} else if (
+					error &&
+					typeof error === 'object' &&
+					'exitCode' in error &&
+					'err' in error &&
+					'out' in error
+				) {
+					// 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.'
+					);
+					if ( error.out ) {
+						process.stdout.write( error.out );
+					}
+					if ( error.err ) {
+						process.stderr.write( error.err );
+					}
+					process.exit( error.exitCode );
+				} else if ( error ) {
+					// Error is an unknown error. That means there was a bug in our code.
+					spinner.fail(
+						typeof error === 'string' ? error : error.message
+					);
+					// Disable reason: Using console.error() means we get a stack trace.
+					console.error( error );
+					process.exit( 1 );
+				} else {
+					spinner.fail( 'An unknown error occured.' );
+					process.exit( 1 );
+				}
 			}
-		}
-	);
-};
+		);
+	};
 
 module.exports = function cli() {
 	// Do nothing if Docker is unavailable.

package/lib/config/test/config.js

@@ -415,8 +415,7 @@ describe( 'readConfig', () => {
 					},
 					{
 						type: 'git',
-						url:
-							'https://github.com/WordPress/theme-experiments.git',
+						url: 'https://github.com/WordPress/theme-experiments.git',
 						ref: 'tt1-blocks@0.4.3',
 						path: expect.stringMatching(
 							/^(\/||\\).*theme-experiments(\/||\\)tt1-blocks$/
@@ -447,22 +446,19 @@ describe( 'readConfig', () => {
 				pluginSources: [
 					{
 						type: 'zip',
-						url:
-							'https://downloads.wordpress.org/plugin/gutenberg.zip',
+						url: 'https://downloads.wordpress.org/plugin/gutenberg.zip',
 						path: expect.stringMatching( /^(\/||\\).*gutenberg$/ ),
 						basename: 'gutenberg',
 					},
 					{
 						type: 'zip',
-						url:
-							'https://downloads.wordpress.org/plugin/gutenberg.8.1.0.zip',
+						url: 'https://downloads.wordpress.org/plugin/gutenberg.8.1.0.zip',
 						path: expect.stringMatching( /^(\/||\\).*gutenberg$/ ),
 						basename: 'gutenberg',
 					},
 					{
 						type: 'zip',
-						url:
-							'https://downloads.wordpress.org/theme/twentytwenty.zip',
+						url: 'https://downloads.wordpress.org/theme/twentytwenty.zip',
 						path: expect.stringMatching(
 							/^(\/||\\).*twentytwenty$/
 						),
@@ -470,8 +466,7 @@ describe( 'readConfig', () => {
 					},
 					{
 						type: 'zip',
-						url:
-							'https://downloads.wordpress.org/theme/twentytwenty.1.3.zip',
+						url: 'https://downloads.wordpress.org/theme/twentytwenty.1.3.zip',
 						path: expect.stringMatching(
 							/^(\/||\\).*twentytwenty$/
 						),
@@ -502,15 +497,13 @@ describe( 'readConfig', () => {
 				pluginSources: [
 					{
 						type: 'zip',
-						url:
-							'https://www.example.com/test/path/to/gutenberg.zip',
+						url: 'https://www.example.com/test/path/to/gutenberg.zip',
 						path: expect.stringMatching( /^(\/||\\).*gutenberg$/ ),
 						basename: 'gutenberg',
 					},
 					{
 						type: 'zip',
-						url:
-							'https://www.example.com/test/path/to/gutenberg.8.1.0.zip',
+						url: 'https://www.example.com/test/path/to/gutenberg.8.1.0.zip',
 						path: expect.stringMatching(
 							/^(\/||\\).*gutenberg.8.1.0$/
 						),
@@ -518,8 +511,7 @@ describe( 'readConfig', () => {
 					},
 					{
 						type: 'zip',
-						url:
-							'https://www.example.com/test/path/to/twentytwenty.zip',
+						url: 'https://www.example.com/test/path/to/twentytwenty.zip',
 						path: expect.stringMatching(
 							/^(\/||\\).*twentytwenty$/
 						),
@@ -527,8 +519,7 @@ describe( 'readConfig', () => {
 					},
 					{
 						type: 'zip',
-						url:
-							'https://www.example.com/test/path/to/twentytwenty.1.3.zip',
+						url: 'https://www.example.com/test/path/to/twentytwenty.1.3.zip',
 						path: expect.stringMatching(
 							/^(\/||\\).*twentytwenty.1.3$/
 						),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "4.8.0",
+	"version": "4.9.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -51,5 +51,5 @@
 	"scripts": {
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
-	"gitHead": "a3e0b62091e8a8bdf5e2518e42d60d7098af48cc"
+	"gitHead": "48d5f37dfb52d2e77c8eeb662f9874cf141b8c6b"
 }