Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use compiler.apply for Progress Plugin #1772

Merged
merged 3 commits into from
Aug 27, 2020
Merged

fix: use compiler.apply for Progress Plugin #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3055e73
fix: use default webpack handler
rishabh3112 Aug 27, 2020
4daf165
chore: update tests
rishabh3112 Aug 27, 2020
0b2ebbd
Merge branch 'next' into fix/progress-handler
jamesgeorge007 Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions packages/webpack-cli/lib/utils/Compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
const webpack = require('webpack');
const logger = require('./logger');
const { cyanBright, greenBright } = require('colorette');
const { CompilerOutput } = require('./CompilerOutput');
const readline = require('readline');

class Compiler {
constructor() {
Expand All @@ -18,36 +16,15 @@ class Compiler {

compilation.hooks.beforeRun.tap('webpackProgress', () => {
if (outputOptions.progress) {
process.stdout.write('\n');
const defaultProgressPluginHandler = (percent, msg) => {
percent = Math.floor(percent * 100);
readline.clearLine(process.stdout, 0);
readline.cursorTo(process.stdout, 0, null);
if (percent !== undefined) {
process.stdout.write(' (');
for (let i = 0; i <= 100; i += 10) {
if (i <= percent) {
process.stdout.write(greenBright('#'));
} else {
process.stdout.write('#');
}
}
process.stdout.write(`) ${percent}% : `);
process.stdout.write(`${cyanBright(msg)}`);
if (percent === 100) {
process.stdout.write(`${cyanBright('Compilation completed\n')}`);
}
}
};
if (!progressPluginExists) {
new ProgressPlugin(defaultProgressPluginHandler).apply(compilation);
new ProgressPlugin().apply(compilation);
} else {
if (!progressPluginExists.handler) {
options.plugins = options.plugins.filter((e) => e !== progressPluginExists);
Object.keys(progressPluginExists).map((opt) => {
ProgressPlugin.defaultOptions[opt] = progressPluginExists[opt];
});
new ProgressPlugin(defaultProgressPluginHandler).apply(compilation);
new ProgressPlugin().apply(compilation);
} else {
progressPluginExists.apply(compilation);
}
Expand Down
5 changes: 2 additions & 3 deletions test/progress/progress-flag.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ const { run } = require('../utils/test-utils');
describe('progress flag', () => {
it('should show progress', () => {
const { stderr, stdout } = run(__dirname, ['--progress']);
expect(stderr).toBeFalsy();
expect(stdout).toContain('100%');
expect(stdout).toContain('Compilation completed');
expect(stderr).toContain('[webpack.Progress] 100%');
expect(stdout).toContain('main.js');
});
});