From 3a8ae67acb051ece0f6b84c394863a7977703565 Mon Sep 17 00:00:00 2001 From: evilebottnawi Date: Sun, 3 Jan 2021 18:55:25 +0300 Subject: [PATCH 1/2] feat: allow to pass parseOption to CLI class --- packages/webpack-cli/lib/index.js | 12 +++--------- packages/webpack-cli/lib/webpack-cli.js | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/webpack-cli/lib/index.js b/packages/webpack-cli/lib/index.js index f284f9074db..fa7a933054f 100644 --- a/packages/webpack-cli/lib/index.js +++ b/packages/webpack-cli/lib/index.js @@ -1,13 +1,7 @@ -const WebpackCLI = require('./webpack-cli'); -const { commands } = require('./utils/cli-flags'); +const CLI = require('./webpack-cli'); const logger = require('./utils/logger'); const getPackageManager = require('./utils/get-package-manager'); -module.exports = WebpackCLI; - +module.exports = CLI; // export additional utils used by other packages -module.exports.utils = { - logger, - commands, - getPackageManager, -}; +module.exports.utils = { logger, getPackageManager }; diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js index df8649fba1a..54731003828 100644 --- a/packages/webpack-cli/lib/webpack-cli.js +++ b/packages/webpack-cli/lib/webpack-cli.js @@ -219,7 +219,7 @@ class WebpackCLI { return flags; } - async run(args) { + async run(args, parseOptions) { // Built-in internal commands const bundleCommandOptions = { name: 'bundle', @@ -708,7 +708,7 @@ class WebpackCLI { await this.program.parseAsync([commandName, ...options], { from: 'user' }); }); - await this.program.parseAsync(args); + await this.program.parseAsync(args, parseOptions); } async resolveConfig(options) { @@ -732,7 +732,7 @@ class WebpackCLI { } logger.error(error); - process.exit(2); + // process.exit(2); } } From 692723abaea662a21d311812e4ead6be4d6c016f Mon Sep 17 00:00:00 2001 From: evilebottnawi Date: Sun, 3 Jan 2021 19:13:17 +0300 Subject: [PATCH 2/2] refactor: code --- packages/webpack-cli/lib/webpack-cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js index 54731003828..8743724ea52 100644 --- a/packages/webpack-cli/lib/webpack-cli.js +++ b/packages/webpack-cli/lib/webpack-cli.js @@ -732,7 +732,7 @@ class WebpackCLI { } logger.error(error); - // process.exit(2); + process.exit(2); } }