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

Jump to bottom

refactor: pass a callback to webpack from webpack-cli #1977

Merged
merged 12 commits into from Oct 26, 2020
Merged

refactor: pass a callback to webpack from webpack-cli #1977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d630c10
refactor: pass a callback to webpack from webpack-cli
piecyk Oct 22, 2020
34aebe6
refactor: extract WebpackCLIPlugin
piecyk Oct 22, 2020
217475a
refactor: revert to error code 2
piecyk Oct 22, 2020
e210089
fix: uncomment cache-flags.test
piecyk Oct 22, 2020
996e388
refactor: set isWatchMode only once per run
piecyk Oct 22, 2020
fd846e2
fix: read ProgressPlugin from compiler.webpack for v5
piecyk Oct 22, 2020
793b444
refactor: move watching message to WebpackCLIPlugin
piecyk Oct 22, 2020
65107da
fix: clear cache before each test in cache-flags.test.js
piecyk Oct 22, 2020
963e1e7
fix: compiler.options can be undefined in webpack 4
piecyk Oct 23, 2020
f2cc615
fix: revert analyze flag test
piecyk Oct 23, 2020
928a811
fix: tests
piecyk Oct 23, 2020
40b202f
refactor: replace ternary with or operator where applicable
piecyk Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/webpack-cli/lib/plugins/WebpackCLIPlugin.js
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ class WebpackCLIPlugin {

for (const compiler of compilers) {
if (this.options.progress) {
const { ProgressPlugin } = webpack;
const { ProgressPlugin } = compiler.webpack || webpack;

let progressPluginExists;

Expand Down
16 changes: 8 additions & 8 deletions packages/webpack-cli/lib/webpack-cli.js
View file
Open in desktop
Expand Up @@ -253,6 +253,14 @@ class WebpackCLI extends GroupHelper {
let options = this.compilerConfiguration;
let outputOptions = this.outputConfiguration;

let isWatchMode;

if (Array.isArray(options)) {
isWatchMode = options.some((options) => options.watch);
} else {
isWatchMode = options.watch;
}
piecyk marked this conversation as resolved.
Show resolved Hide resolved

const isRawOutput = typeof outputOptions.json === 'undefined';

if (isRawOutput) {
Expand Down Expand Up @@ -320,14 +328,6 @@ class WebpackCLI extends GroupHelper {
logger.raw(`${stats.toString(foundStats)}`);
}

let isWatchMode = false;

if (Array.isArray(options)) {
isWatchMode = options.some((options) => options.watch);
} else {
isWatchMode = options.watch;
}

if (isWatchMode) {
logger.success('watching files for updates...');
}
Expand Down