fix(webpack): throw a standard error

unjs · Feb 6, 2024 · 41978c0 · 41978c0
1 parent e442dfa
commit 41978c0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/src/rspack/context.ts b/src/rspack/context.ts
@@ -38,13 +38,17 @@ export function createBuildContext(compilation: Compilation): UnpluginBuildConte
 }
 
 export function createContext(loader: LoaderContext): UnpluginContext {
-  function normalizeMessage(error: string | UnpluginMessage): Error {
-    return typeof error === 'string'
-      ? new Error(error)
-      : error as Error
-  }
   return {
     error: error => loader.emitError(normalizeMessage(error)),
     warn: message => loader.emitWarning(normalizeMessage(message)),
   }
 }
+
+export function normalizeMessage(error: string | UnpluginMessage): Error {
+  const err = new Error(typeof error === 'string' ? error : error.message)
+  if (typeof error === 'object') {
+    err.stack = error.stack
+    err.cause = error.meta
+  }
+  return err
+}
diff --git a/src/webpack/context.ts b/src/webpack/context.ts
@@ -63,13 +63,17 @@ export function createBuildContext(options: ContextOptions, compilation?: Compil
 }
 
 export function createContext(loader: LoaderContext<{ unpluginName: string }>): UnpluginContext {
-  function normalizeMessage(error: string | UnpluginMessage): Error {
-    return typeof error === 'string'
-      ? new Error(error)
-      : error as Error
-  }
   return {
     error: error => loader.emitError(normalizeMessage(error)),
     warn: message => loader.emitWarning(normalizeMessage(message)),
   }
 }
+
+export function normalizeMessage(error: string | UnpluginMessage): Error {
+  const err = new Error(typeof error === 'string' ? error : error.message)
+  if (typeof error === 'object') {
+    err.stack = error.stack
+    err.cause = error.meta
+  }
+  return err
+}
diff --git a/src/webpack/index.ts b/src/webpack/index.ts
@@ -5,7 +5,7 @@ import VirtualModulesPlugin from 'webpack-virtual-modules'
 import type { ResolvePluginInstance, Resolver } from 'webpack'
 import type { ResolvedUnpluginOptions, UnpluginContext, UnpluginContextMeta, UnpluginFactory, UnpluginInstance, WebpackCompiler } from '../types'
 import { normalizeAbsolutePath, shouldLoad, toArray, transformUse } from '../utils'
-import { contextOptionsFromCompilation, createBuildContext } from './context'
+import { contextOptionsFromCompilation, createBuildContext, normalizeMessage } from './context'
 
 const TRANSFORM_LOADER = resolve(
   __dirname,
@@ -105,7 +105,7 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(
                     const pluginContext: UnpluginContext = {
                       error(msg) {
                         if (error == null)
-                          error = typeof msg === 'string' ? new Error(msg) : msg as Error
+                          error = normalizeMessage(msg)
                         else
                           console.error(`unplugin/webpack: multiple errors returned from resolveId hook: ${msg}`)
                       },