From 6f4a5a2b4ec77b27967c1ca504100438b87f247f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Bezr=C4=85k?= Date: Fri, 3 Mar 2023 12:36:42 +0100 Subject: [PATCH] prevent calling stats.toJson() --- .../razzle-dev-utils/FriendlyErrorsPlugin.js | 2 +- packages/razzle/scripts/build.js | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/razzle-dev-utils/FriendlyErrorsPlugin.js b/packages/razzle-dev-utils/FriendlyErrorsPlugin.js index ca9afe82e..a52cfb146 100644 --- a/packages/razzle-dev-utils/FriendlyErrorsPlugin.js +++ b/packages/razzle-dev-utils/FriendlyErrorsPlugin.js @@ -21,7 +21,7 @@ class WebpackErrorsPlugin { apply(compiler) { compiler.plugin('done', stats => { - const rawMessages = stats.toJson({}, true); + const rawMessages = stats.toJson('errors-warnings'); const messages = formatWebpackMessages(rawMessages); WEBPACK_COMPILING = false; if (!messages.errors.length && !messages.warnings.length) { diff --git a/packages/razzle/scripts/build.js b/packages/razzle/scripts/build.js index 7d2e53a54..1829aa43e 100755 --- a/packages/razzle/scripts/build.js +++ b/packages/razzle/scripts/build.js @@ -108,16 +108,15 @@ loadRazzleConfig(webpack).then( if (err) { return reject(err); } - const clientMessages = clientStats.toJson({}, true); - if (clientMessages.errors.length) { - return reject(clientMessages.errors); + if (clientStats.hasErrors()) { + return reject(clientStats.toJson('errors-only').errors); } if ( !process.env.WARNINGS_ERRORS_DISABLE && process.env.CI && (typeof process.env.CI !== 'string' || process.env.CI.toLowerCase() !== 'false') && - clientMessages.warnings.length + clientStats.hasWarnings() ) { console.log( chalk.yellow( @@ -125,13 +124,15 @@ loadRazzleConfig(webpack).then( 'Most CI servers set it automatically.\n' ) ); - return reject(clientMessages.warnings); + return reject(clientStats.toJson('errors-warnings').warnings); } return resolve({ stats: clientStats, previousFileSizes, - warnings: clientMessages.warnings, + warnings: clientStats.hasWarnings() + ? clientStats.toJson('errors-warnings').warnings + : [], }); }, (err) => { return reject(err); @@ -225,16 +226,15 @@ loadRazzleConfig(webpack).then( if (err) { return reject(err); } - const serverMessages = serverStats.toJson({}, true); - if (serverMessages.errors.length) { - return reject(serverMessages.errors); + if (serverStats.hasErrors()) { + return reject(serverStats.toJson('errors-only').errors); } if ( !process.env.WARNINGS_ERRORS_DISABLE && process.env.CI && (typeof process.env.CI !== 'string' || process.env.CI.toLowerCase() !== 'false') && - serverMessages.warnings.length + serverStats.hasWarnings() ) { console.log( chalk.yellow( @@ -242,12 +242,14 @@ loadRazzleConfig(webpack).then( 'Most CI servers set it automatically.\n' ) ); - return reject(serverMessages.warnings); + return reject(serverStats.toJson('errors-warnings').warnings); } return resolve({ stats: serverStats, - warnings: serverMessages.warnings, + warnings: serverStats.hasWarnings() + ? serverStats.toJson('errors-warnings').warnings + : [], }); }, (err) => { return reject(err);