refactor: replace ternary with or operator where applicable

webpack · Oct 25, 2020 · 40b202f · 40b202f
1 parent 928a811
commit 40b202f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/webpack-cli/lib/plugins/WebpackCLIPlugin.js b/packages/webpack-cli/lib/plugins/WebpackCLIPlugin.js
@@ -9,7 +9,7 @@ class WebpackCLIPlugin {
         this.options = options;
     }
     async apply(compiler) {
-        const compilers = compiler.compilers ? compiler.compilers : [compiler];
+        const compilers = compiler.compilers || [compiler];
 
         for (const compiler of compilers) {
             if (this.options.progress) {
@@ -27,17 +27,19 @@ class WebpackCLIPlugin {
             }
         }
 
+        const compilationName = (compilation) => (compilation.name ? ` ${compilation.name}` : '');
+
         compiler.hooks.watchRun.tap(PluginName, (compilation) => {
             const { bail, watch } = compilation.options;
             if (bail && watch) {
                 logger.warn('You are using "bail" with "watch". "bail" will still exit webpack when the first error is found.');
             }
 
-            logger.success(`Compilation${compilation.name ? `${compilation.name}` : ''} starting...`);
+            logger.success(`Compilation${compilationName(compilation)} starting...`);
         });
 
         compiler.hooks.done.tap(PluginName, (compilation) => {
-            logger.success(`Compilation${compilation.name ? `${compilation.name}` : ''} finished`);
+            logger.success(`Compilation${compilationName(compilation)} finished`);
 
             process.nextTick(() => {
                 if (compiler.watchMode) {

diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js
@@ -216,7 +216,7 @@ class WebpackCLI extends GroupHelper {
     handleError(error) {
         // https://github.com/webpack/webpack/blob/master/lib/index.js#L267
         // https://github.com/webpack/webpack/blob/v4.44.2/lib/webpack.js#L90
-        const ValidationError = webpack.ValidationError ? webpack.ValidationError : webpack.WebpackOptionsValidationError;
+        const ValidationError = webpack.ValidationError || webpack.WebpackOptionsValidationError;
 
         // In case of schema errors print and exit process
         // For webpack@4 and webpack@5