fix: spawn new process for executor

webpack · Aug 11, 2020 · 98023d1 · 98023d1
1 parent ddddaac
commit 98023d1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git 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/bootstrap');
+jest.mock('../lib/runner');
 jest.mock('enquirer');
 
-const runCLI = require('../lib/bootstrap');
-runCLI.mockImplementation(() => {});
+const runner = require('../lib/runner');
+runner.mockImplementation(() => {});
 
 describe('CLI Executer', () => {
     let cliExecuter = null;
@@ -48,8 +48,8 @@ describe('CLI Executer', () => {
         await cliExecuter();
 
         // ensure that the webpack runCLI is called
-        expect(runCLI.mock.calls.length).toEqual(1);
-        expect(runCLI.mock.calls[0]).toEqual([[], ['--config', 'test1', '--entry', 'test2', '--progress']]);
+        expect(runner.mock.calls.length).toEqual(1);
+        expect(runner.mock.calls[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/bootstrap.js b/packages/webpack-cli/lib/bootstrap.js
@@ -60,7 +60,7 @@ async function runCLI(cliArgs) {
             parsedArgs.unknownArgs.forEach((unknown) => {
                 logger.warn('Unknown argument:', unknown);
             });
-            cliExecuter();
+            await cliExecuter();
             return;
         }
         const parsedArgsOpts = parsedArgs.opts;

diff --git a/packages/webpack-cli/lib/runner.js b/packages/webpack-cli/lib/runner.js
@@ -0,0 +1,10 @@
+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
@@ -2,7 +2,7 @@ const { MultiSelect, Input } = require('enquirer');
 const { cyan } = require('colorette');
 const logger = require('./logger');
 const cliArgs = require('./cli-flags').core;
-const runCLI = require('../bootstrap');
+const runner = require('../runner');
 
 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');
-        runCLI(args);
+        await runner([], args);
     } catch (err) {
         logger.error(`Action Interrupted, use ${cyan('webpack-cli help')} to see possible options.`);
     }