Skip to content

Commit aab999c

Browse files
fix: restore moduleHasErrors guard in after-compile
Agent-Logs-Url: https://github.com/TypeStrong/ts-loader/sessions/caa59e7e-b86c-4051-9d2e-f6f6bea4b768 Co-authored-by: johnnyreilly <1010525+johnnyreilly@users.noreply.github.com>
1 parent c0aafcc commit aab999c

2 files changed

Lines changed: 284 additions & 151 deletions

File tree

src/after-compile.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,15 @@ function provideErrorsToWebpack(
266266
compilation.compiler.context
267267
);
268268

269-
// if (!moduleHasErrors(module, instance.isWebpack5)) {
269+
if (!moduleHasErrors(module, instance.isWebpack5)) {
270270
formattedErrors.forEach(error => {
271271
if (module.addError) {
272272
module.addError(error);
273273
} else {
274274
module.errors.push(error);
275275
}
276276
});
277-
// }
277+
}
278278

279279
compilation.errors.push(...formattedErrors);
280280
});
@@ -336,15 +336,15 @@ function provideSolutionErrorsToWebpack(
336336
compilation.compiler.context
337337
);
338338

339-
// if (!moduleHasErrors(module, instance.isWebpack5)) {
339+
if (!moduleHasErrors(module, instance.isWebpack5)) {
340340
formattedErrors.forEach(error => {
341341
if (module.addError) {
342342
module.addError(error);
343343
} else {
344344
module.errors.push(error);
345345
}
346346
});
347-
// }
347+
}
348348

349349
compilation.errors.push(...formattedErrors);
350350
});
@@ -577,9 +577,9 @@ function isTSLoaderModuleError(error: any, loaderOptions: LoaderOptions) {
577577
);
578578
}
579579

580-
// function moduleHasErrors(module: webpack.Module, isWebpack5: boolean) {
581-
// return isWebpack5
582-
// ? Array.from(module.getErrors!() || []).length > 0
583-
// : (((module as any).errors as webpack.WebpackError[] | undefined) || [])
584-
// .length > 0;
585-
// }
580+
function moduleHasErrors(module: webpack.Module, isWebpack5: boolean) {
581+
return isWebpack5
582+
? Array.from(module.getErrors!() || []).length > 0
583+
: (((module as any).errors as webpack.WebpackError[] | undefined) || [])
584+
.length > 0;
585+
}

0 commit comments

Comments
 (0)