From 08aaff3ccc249749da742e2e9c0bb09f82cc1001 Mon Sep 17 00:00:00 2001
From: James George <jamesgeorge998001@gmail.com>
Date: Wed, 19 Aug 2020 15:46:14 +0530
Subject: [PATCH] refactor: cliExecuter consumes runCLI (#1754)

---
 packages/webpack-cli/__tests__/cli-executer.test.js | 10 +++++-----
 packages/webpack-cli/lib/runner.js                  | 10 ----------
 packages/webpack-cli/lib/utils/cli-executer.js      |  4 ++--
 3 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 packages/webpack-cli/lib/runner.js

diff --git a/packages/webpack-cli/__tests__/cli-executer.test.js b/packages/webpack-cli/__tests__/cli-executer.test.js
index a67b63bc293..74bdde7c346 100644
--- a/packages/webpack-cli/__tests__/cli-executer.test.js
+++ b/packages/webpack-cli/__tests__/cli-executer.test.js
@@ -1,8 +1,8 @@
-jest.mock('../lib/runner');
+jest.mock('../lib/bootstrap');
 jest.mock('enquirer');
 
-const runner = require('../lib/runner');
-runner.mockImplementation(() => {});
+const runCLI = require('../lib/bootstrap');
+runCLI.mockImplementation(() => {});
 
 describe('CLI Executer', () => {
     let cliExecuter = null;
@@ -48,8 +48,8 @@ describe('CLI Executer', () => {
         await cliExecuter();
 
         // ensure that the webpack runCLI is called
-        expect(runner.mock.calls.length).toEqual(1);
-        expect(runner.mock.calls[0]).toEqual([[], ['--config', 'test1', '--entry', 'test2', '--progress']]);
+        expect(runCLI.mock.calls.length).toEqual(1);
+        expect(runCLI.mock.calls[0][0]).toEqual(['--config', 'test1', '--entry', 'test2', '--progress']);
 
         // check that webpack options are actually being displayed that
         // the user can select from
diff --git a/packages/webpack-cli/lib/runner.js b/packages/webpack-cli/lib/runner.js
deleted file mode 100644
index 50295954e04..00000000000
--- a/packages/webpack-cli/lib/runner.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const execa = require('execa');
-const cliPath = require.resolve('./bootstrap.js');
-
-function runner(nodeArgs, cliArgs) {
-    execa('node', [...nodeArgs, cliPath, ...cliArgs], { stdio: 'inherit' }).catch((e) => {
-        process.exit(e.exitCode);
-    });
-}
-
-module.exports = runner;
diff --git a/packages/webpack-cli/lib/utils/cli-executer.js b/packages/webpack-cli/lib/utils/cli-executer.js
index fbb2ef6895c..8c4a89cd95b 100644
--- a/packages/webpack-cli/lib/utils/cli-executer.js
+++ b/packages/webpack-cli/lib/utils/cli-executer.js
@@ -2,7 +2,7 @@ const { MultiSelect, Input } = require('enquirer');
 const { cyan } = require('colorette');
 const logger = require('./logger');
 const cliArgs = require('./cli-flags').core;
-const runner = require('../runner');
+const runCLI = require('../bootstrap');
 
 async function prompter() {
     const args = [];
@@ -56,7 +56,7 @@ async function run() {
         const args = await prompter();
         process.stdout.write('\n');
         logger.info('Executing CLI\n');
-        await runner([], args);
+        await runCLI(args);
     } catch (err) {
         logger.error(`Action Interrupted, use ${cyan('webpack-cli help')} to see possible options.`);
     }