Update dependency execa to v7 (#28933)

* Update dependency execa to v7 * Update include convention --------- Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Feb 13, 2023 · 2defe1d · 2defe1d
1 parent 732bf89
commit 2defe1d
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 16 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/cli/commands/build.js b/tools/cli/commands/build.js
@@ -4,7 +4,7 @@ import { once } from 'node:events';
 import { createInterface as rlcreateInterface } from 'node:readline';
 import npath from 'path';
 import chalk from 'chalk';
-import execa from 'execa';
+import { execa } from 'execa';
 import inquirer from 'inquirer';
 import Listr from 'listr';
 import ListrState from 'listr/lib/state.js';

diff --git a/tools/cli/commands/cli.js b/tools/cli/commands/cli.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
-import execa from 'execa';
+import { execaCommand, execaCommandSync } from 'execa';
 import Listr from 'listr';
 import UpdateRenderer from 'listr-update-renderer';
 import VerboseRenderer from 'listr-verbose-renderer';
@@ -169,6 +169,6 @@ function command( cmd, verbose, cwd ) {
 	}
 
 	return verbose
-		? execa.commandSync( `${ cmd }`, { cwd: cwd, env: env, stdio: 'inherit' } )
-		: execa.command( `${ cmd }`, { cwd: cwd, env: env } );
+		? execaCommandSync( `${ cmd }`, { cwd: cwd, env: env, stdio: 'inherit' } )
+		: execaCommand( `${ cmd }`, { cwd: cwd, env: env } );
 }
diff --git a/tools/cli/commands/install.js b/tools/cli/commands/install.js
@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import chalk from 'chalk';
-import execa from 'execa';
+import { execa } from 'execa';
 import Listr from 'listr';
 import UpdateRenderer from 'listr-update-renderer';
 import VerboseRenderer from 'listr-verbose-renderer';

diff --git a/tools/cli/commands/rsync.js b/tools/cli/commands/rsync.js
@@ -3,7 +3,7 @@ import path from 'path';
 import process from 'process';
 import chalk from 'chalk';
 import Configstore from 'configstore';
-import execa from 'execa';
+import { execa } from 'execa';
 import inquirer from 'inquirer';
 import tmp from 'tmp';
 import { projectDir } from '../helpers/install.js';

diff --git a/tools/cli/commands/test.js b/tools/cli/commands/test.js
@@ -1,7 +1,7 @@
 import child_process from 'child_process';
 import path from 'path';
 import chalk from 'chalk';
-import execa from 'execa';
+import { execa } from 'execa';
 import inquirer from 'inquirer';
 import Listr from 'listr';
 import UpdateRenderer from 'listr-update-renderer';

diff --git a/tools/cli/helpers/checkEnvironment.js b/tools/cli/helpers/checkEnvironment.js
@@ -4,7 +4,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import chalk from 'chalk';
 import * as envfile from 'envfile';
-import execa from 'execa';
+import { execaNode } from 'execa';
 import semver from 'semver';
 
 /**
@@ -91,7 +91,7 @@ export async function checkCliLocation() {
 		);
 
 		// Alas node doesn't expose `execve()` or the like, so this seems the best we can do without messing with native function call stuff.
-		const res = await execa.node( exe, process.argv.slice( 2 ), {
+		const res = await execaNode( exe, process.argv.slice( 2 ), {
 			env: {
 				JETPACK_CLI_DID_REEXEC: thisRoot,
 			},

diff --git a/tools/cli/helpers/install.js b/tools/cli/helpers/install.js
@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import path from 'path';
-import execa from 'execa';
+import { execa } from 'execa';
 
 /**
  * Test if a lockfile is checked in.

diff --git a/tools/cli/package.json b/tools/cli/package.json
@@ -26,7 +26,7 @@
 		"chalk": "4.1.2",
 		"configstore": "5.0.1",
 		"envfile": "6.17.0",
-		"execa": "5.0.0",
+		"execa": "7.0.0",
 		"tmp": "0.2.1",
 		"glob": "7.1.6",
 		"ignore": "5.1.8",

diff --git a/tools/cli/tests/integration/commands/build.test.js b/tools/cli/tests/integration/commands/build.test.js
@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url';
-import execa from 'execa';
+import { execa } from 'execa';
 
 describe( 'build command', () => {
 	test( 'production flag exists', async () => {

diff --git a/tools/cli/tests/integration/commands/commands.test.js b/tools/cli/tests/integration/commands/commands.test.js
@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url';
-import execa from 'execa';
+import { execa } from 'execa';
 
 const { stdout: help } = await execa(
 	fileURLToPath( new URL( '../../../bin/jetpack.js', import.meta.url ) ),