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

fix: avoid unnecessary stringify #1920

Merged
merged 6 commits into from Oct 11, 2020
Merged

fix: avoid unnecessary stringify #1920

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70ba799
fix: avoid unnecessary stringify
alexander-akait Oct 11, 2020
f3d0310
tests: errors/warnings
alexander-akait Oct 11, 2020
969d885
tests: fix
alexander-akait Oct 11, 2020
bfce721
tests: debug problems
alexander-akait Oct 11, 2020
101929d
tests: fix
alexander-akait Oct 11, 2020
6fa0abb
tests: fix
alexander-akait Oct 11, 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
59 changes: 25 additions & 34 deletions packages/webpack-cli/lib/utils/Compiler.js
View file
Open in desktop
Expand Up @@ -55,49 +55,38 @@ class Compiler {
});
}

generateOutput(outputOptions, stats) {
logger.raw(`${stats.toString(this.compilerOptions.stats)}\n`);
if (outputOptions.watch) {
logger.info('watching files for updates...');
}
}

compilerCallback(err, stats, lastHash, options, outputOptions) {
const statsErrors = [];

if (!outputOptions.watch || err) {
// Do not keep cache anymore
this.compiler.purgeInputFileSystem();
}
if (err) {
compilerCallback(error, stats, lastHash, options, outputOptions) {
if (error) {
lastHash = null;
logger.error(err.stack || err);
logger.error(error);
process.exit(1);
}

if (!outputOptions.watch && stats.hasErrors()) {
process.exitCode = 1;
}
if (outputOptions.json === true) {
process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + '\n');
} else if (stats.hash !== lastHash) {

if (stats.hash !== lastHash) {
lastHash = stats.hash;
if (stats.compilation && stats.compilation.errors.length !== 0) {
const errors = stats.compilation.errors;
errors.forEach((statErr) => {
const errLoc = statErr.module ? statErr.module.resource : null;
statsErrors.push({ name: statErr.message, loc: errLoc });
});
}
const JSONStats = JSON.stringify(stats.toJson(outputOptions), null, 2);
if (typeof outputOptions.json === 'string') {

if (outputOptions.json === true) {
process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + '\n');
} else if (typeof outputOptions.json === 'string') {
const JSONStats = JSON.stringify(stats.toJson(outputOptions), null, 2);

try {
writeFileSync(outputOptions.json, JSONStats);
logger.success(`stats are successfully stored as json to ${outputOptions.json}`);
} catch (err) {
logger.error(err);
}
} else {
logger.raw(`${stats.toString(this.compilerOptions.stats)}\n`);
}

if (outputOptions.watch) {
logger.info('watching files for updates...');
}
return this.generateOutput(outputOptions, stats, statsErrors);
}
}

Expand All @@ -107,20 +96,22 @@ class Compiler {
await this.compiler.run((err, stats) => {
if (this.compiler.close) {
this.compiler.close(() => {
const content = this.compilerCallback(err, stats, lastHash, options, outputOptions);
resolve(content);
this.compilerCallback(err, stats, lastHash, options, outputOptions);

resolve();
});
} else {
const content = this.compilerCallback(err, stats, lastHash, options, outputOptions);
resolve(content);
this.compilerCallback(err, stats, lastHash, options, outputOptions);

resolve();
}
});
});
}

async invokeWatchInstance(lastHash, options, outputOptions, watchOptions) {
return this.compiler.watch(watchOptions, (err, stats) => {
return this.compilerCallback(err, stats, lastHash, options, outputOptions);
this.compilerCallback(err, stats, lastHash, options, outputOptions);
});
}

Expand Down