feat: add common addErrorToModule

Author: johnnyreilly

src/after-compile.ts

@@ -19,7 +19,7 @@ import {
   populateReverseDependencyGraph,
   tsLoaderSource,
 } from './utils';
-import { isWebpack5 } from './loaderUtils';
+import { addErrorToModule, isWebpack5 } from './loaderUtils';
 
 /**
  * This returns a function that has options to add assets and also to provide errors to webpack
@@ -256,13 +256,7 @@ function provideErrorsToWebpack(
         );
 
         if (!moduleHasWebpackErrors(module)) {
-          formattedErrors.forEach(error => {
-            if (module.addError) {
-              module.addError(error);
-            } else {
-              module.errors.push(error);
-            }
-          });
+          formattedErrors.forEach(error => addErrorToModule(module, error));
         }
 
         compilation.errors.push(...formattedErrors);
@@ -322,13 +316,7 @@ function provideSolutionErrorsToWebpack(
         );
 
         if (!moduleHasWebpackErrors(module)) {
-          formattedErrors.forEach(error => {
-            if (module.addError) {
-              module.addError(error);
-            } else {
-              module.errors.push(error);
-            }
-          });
+          formattedErrors.forEach(error => addErrorToModule(module, error));
         }
 
         compilation.errors.push(...formattedErrors);

src/index.ts

@@ -28,6 +28,7 @@ import {
 } from './utils';
 import type { RawSourceMap } from 'source-map';
 import { SourceMapConsumer, SourceMapGenerator } from 'source-map';
+import { addErrorToModule } from './loaderUtils';
 
 /** 
  * we can only use SourceMapConsumer if the version available has a destroy method
@@ -676,32 +677,16 @@ function getTranspilationEmit(
       loaderContext.context
     );
 
-    errors.forEach(error => addErrorToModule(module, error));
+    errors.forEach(error => {
+      if (module) {
+        addErrorToModule(module, error);
+      }
+    });
   }
 
   return { outputText, sourceMapText };
 }
 
-function addErrorToModule(
-  module: webpack.LoaderContext<LoaderOptions>['_module'],
-  error: webpack.WebpackError
-) {
-  if (!module) {
-    return;
-  }
-
-  if (module.addError) {
-    module.addError(error);
-    return;
-  }
-
-  const webpackModule = module as any;
-  if (!webpackModule.errors) {
-    webpackModule.errors = [];
-  }
-  webpackModule.errors.push(error);
-}
-
 function makeSourceMap(
   sourceMapText: string | undefined,
   outputText: string,

src/instances.ts

@@ -5,6 +5,7 @@ import type typescript from 'typescript';
 import * as webpack from 'webpack';
 
 import { makeAfterCompile } from './after-compile';
+import { addErrorToModule } from './loaderUtils';
 import { getCompiler, getCompilerOptions } from './compilerSetup';
 import { getConfigFile, getConfigParseResult } from './config';
 import {
@@ -515,30 +516,12 @@ export function reportTranspileErrors(
       loader.context
     );
 
-    [...solutionErrors, ...errors].forEach(error =>
-      addErrorToModule(module, error)
-    );
-  }
-}
-
-function addErrorToModule(
-  module: webpack.LoaderContext<LoaderOptions>['_module'],
-  error: webpack.WebpackError
-) {
-  if (!module) {
-    return;
-  }
-
-  if (module.addError) {
-    module.addError(error);
-    return;
-  }
-
-  const webpackModule = module as any;
-  if (!webpackModule.errors) {
-    webpackModule.errors = [];
+    [...solutionErrors, ...errors].forEach(error => {
+      if (module) {
+        addErrorToModule(module, error);
+      }
+    });
   }
-  webpackModule.errors.push(error);
 }
 
 export function buildSolutionReferences(

src/loaderUtils.ts

@@ -28,3 +28,14 @@ export function getOptions(
 
   return loaderUtils.getOptions<LoaderOptions>(loaderContext as any) || ({} as LoaderOptions);
 }
+
+/**
+ * webpack 4 and webpack 5 have different APIs for adding errors to modules. This function abstracts that away.
+ */
+export function addErrorToModule(module: webpack.Module, error: webpack.WebpackError) {
+  if (isWebpack5) {
+    module.addError(error);
+  } else {
+    module.errors.push(error);
+  }
+}