refactor: improve

Author: alexander-akait

packages/webpack-cli/lib/plugins/CLIPlugin.js

@@ -39,15 +39,18 @@ class CLIPlugin {
 
     setupHelpfulOutput(compiler) {
         const pluginName = 'webpack-cli';
-        const getCompilationName = () => (compiler.name ? ` '${compiler.name}'` : '');
+        const getCompilationName = () => (compiler.name ? `'${compiler.name}'` : '');
 
         const { configPath } = this.options;
 
         compiler.hooks.run.tap(pluginName, () => {
+            const name = getCompilationName();
+
+            this.logger.log(`Compiler${name ? ` ${name}` : ''} starting...`);
+
             if (configPath) {
-                this.logger.log(`Using config '${configPath}'`);
+                this.logger.log(`Compiler${name ? ` ${name}` : ''} is using config: '${configPath}'`);
             }
-            this.logger.log(`Compilation${getCompilationName()} starting...`);
         });
 
         compiler.hooks.watchRun.tap(pluginName, (compiler) => {
@@ -57,11 +60,13 @@ class CLIPlugin {
                 this.logger.warn('You are using "bail" with "watch". "bail" will still exit webpack when the first error is found.');
             }
 
+            const name = getCompilationName();
+
+            this.logger.log(`Compiler${name ? ` ${name}` : ''} starting...`);
+
             if (configPath) {
-                this.logger.log(`Using config ${configPath}`);
+                this.logger.log(`Compiler${name ? ` ${name}` : ''} is using config: '${configPath}'`);
             }
-
-            this.logger.log(`Compilation${getCompilationName()} starting...`);
         });
 
         compiler.hooks.invalid.tap(pluginName, (filename, changeTime) => {
@@ -72,11 +77,13 @@ class CLIPlugin {
         });
 
         (compiler.webpack ? compiler.hooks.afterDone : compiler.hooks.done).tap(pluginName, () => {
-            this.logger.log(`Compilation${getCompilationName()} finished`);
+            const name = getCompilationName();
+
+            this.logger.log(`Compiler${name ? ` ${name}` : ''} finished`);
 
             process.nextTick(() => {
                 if (compiler.watchMode) {
-                    this.logger.log(`Compiler${getCompilationName()} is watching files for updates...`);
+                    this.logger.log(`Compiler${name ? `${name}` : ''} is watching files for updates...`);
                 }
             });
         });

test/build/basic/basic.test.js

@@ -143,9 +143,12 @@ describe('bundle command', () => {
 
     it('should log supplied config when logging level is log', () => {
         const { exitCode, stderr, stdout } = run(__dirname, ['--config', './log.config.js']);
-        expect(exitCode).toBe(0);
         const configPath = resolve(__dirname, './log.config.js');
-        expect(stderr).toContain(`Using config '${configPath}'`);
+
+        expect(exitCode).toBe(0);
+        expect(stderr).toContain('Compiler starting...');
+        expect(stderr).toContain(`Compiler is using config: '${configPath}'`);
+        expect(stderr).toContain('Compiler finished');
         expect(stdout).toBeTruthy();
     });
 });

test/core-flags/infrastructure-logging.test.js

@@ -23,8 +23,8 @@ describe('infrastructure logging related flag', () => {
         const { exitCode, stderr, stdout } = run(__dirname, ['--infrastructure-logging-level', 'log']);
 
         expect(exitCode).toBe(0);
-        expect(stderr).toContain("Compilation 'compiler' starting...");
-        expect(stderr).toContain("Compilation 'compiler' finished");
+        expect(stderr).toContain("Compiler 'compiler' starting...");
+        expect(stderr).toContain("Compiler 'compiler' finished");
         expect(stdout).toContain(`level: 'log'`);
     });
 });

test/json/json.test.js

@@ -111,8 +111,8 @@ describe('json', () => {
         const { exitCode, stderr, stdout } = run(__dirname, ['--json', '--config', 'logging.config.js']);
 
         expect(exitCode).toBe(0);
-        expect(stderr).toContain('Compilation starting');
-        expect(stderr).toContain('Compilation finished');
+        expect(stderr).toContain('Compiler starting...');
+        expect(stderr).toContain('Compiler finished');
         expect(() => JSON.parse(stdout)).not.toThrow();
         expect(JSON.parse(stdout)['hash']).toBeDefined();
     });
@@ -121,8 +121,8 @@ describe('json', () => {
         const { exitCode, stderr, stdout } = run(__dirname, ['--json', 'stats.json', '--config', 'logging.config.js']);
 
         expect(exitCode).toBe(0);
-        expect(stderr).toContain('Compilation starting');
-        expect(stderr).toContain('Compilation finished');
+        expect(stderr).toContain('Compiler starting...');
+        expect(stderr).toContain('Compiler finished');
         expect(stderr).toContain(successMessage);
         expect(stdout).toBeFalsy();
         expect(existsSync(resolve(__dirname, './stats.json'))).toBeTruthy();

test/serve/basic/serve-basic.test.js

@@ -306,6 +306,16 @@ describe('basic serve usage', () => {
         expect(stdout.match(/HotModuleReplacementPlugin/g)).toBeNull();
     });
 
+    it('should log used supplied config with serve', async () => {
+        const { stderr, stdout } = await runServe(__dirname, ['--config', 'log.config.js', '--port', port]);
+        const configPath = path.resolve(__dirname, './log.config.js');
+
+        expect(stderr).toContain('Compiler starting...');
+        expect(stderr).toContain(`Compiler is using config: '${configPath}'`);
+        expect(stderr).toContain('Compiler finished');
+        expect(stdout).toBeTruthy();
+    });
+
     it("should log error on using '--watch' flag with serve", async () => {
         const { stdout, stderr } = await runServe(testPath, ['--watch']);
 
@@ -329,12 +339,4 @@ describe('basic serve usage', () => {
         expect(stderr).toContain("Error: Unknown option '--unknown-flag'");
         expect(stdout).toBeFalsy();
     });
-
-    it('should log used supplied config with serve', async () => {
-        const { stderr, stdout } = await runServe(__dirname, ['--config', 'log.config.js']);
-
-        const configPath = path.resolve(__dirname, './log.config.js');
-        expect(stderr).toContain(`Using config '${configPath}'`);
-        expect(stdout).toBeTruthy();
-    });
 });

test/watch/basic/basic.test.js

@@ -159,6 +159,28 @@ describe('basic', () => {
         });
     });
 
+    it('should log supplied config with watch', (done) => {
+        const proc = runAndGetWatchProc(__dirname, ['watch', '--config', 'log.config.js']);
+        const configPath = resolve(__dirname, './log.config.js');
+
+        let stderr = '';
+
+        proc.stderr.on('data', (chunk) => {
+            const data = chunk.toString();
+
+            stderr += stripAnsi(data);
+
+            if (/Compiler finished/.test(data)) {
+                expect(stderr).toContain('Compiler starting...');
+                expect(stderr).toContain(`Compiler is using config: '${configPath}'`);
+                expect(stderr).toContain('Compiler finished');
+
+                proc.kill();
+                done();
+            }
+        });
+    });
+
     it('should recompile upon file change using the `command` option and the `--watch` option and log warning', async () => {
         const { exitCode, stderr, stdout } = await run(__dirname, ['watch', '--watch', '--mode', 'development']);
 
@@ -176,12 +198,4 @@ describe('basic', () => {
         expect(stderr).toContain("Run 'webpack --help' to see available commands and options");
         expect(stdout).toBeFalsy();
     });
-
-    it('should log supplied config with watch', async () => {
-        const { stderr, stdout } = await run(__dirname, ['watch', '--config', 'log.config.js']);
-
-        const configPath = resolve(__dirname, './log.config.js');
-        expect(stderr).toContain(`Using config '${configPath}'`);
-        expect(stdout).toBeTruthy();
-    });
 });