feat(webpack): use loader options, improve compactiblity with webpack…

… 5 & rspack (#279)
unjs · Mar 10, 2023 · a8817bd · a8817bd
1 parent 72f827e
commit a8817bd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 38 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -114,9 +114,3 @@ export interface UnpluginContext {
   error(message: any): void
   warn(message: any): void
 }
-
-declare module 'webpack' {
-  interface Compiler {
-    $unpluginContext: Record<string, ResolvedUnpluginOptions>
-  }
-}
diff --git a/src/webpack/index.ts b/src/webpack/index.ts
@@ -29,9 +29,6 @@ export function getWebpackPlugin<UserOptions = {}>(
   return (userOptions?: UserOptions) => {
     return {
       apply(compiler: WebpackCompiler) {
-        const injected = compiler.$unpluginContext || {}
-        compiler.$unpluginContext = injected
-
         const meta: UnpluginContextMeta = {
           framework: 'webpack',
           webpack: {
@@ -49,34 +46,26 @@ export function getWebpackPlugin<UserOptions = {}>(
             },
           ) as ResolvedUnpluginOptions
 
-          // inject context object to share with loaders
-          injected[plugin.name] = plugin
-
-          compiler.hooks.thisCompilation.tap(plugin.name, (compilation) => {
-            compilation.hooks.childCompiler.tap(plugin.name, (childCompiler) => {
-              childCompiler.$unpluginContext = injected
-            })
-          })
-
           const externalModules = new Set<string>()
 
           // transform hook
           if (plugin.transform) {
-            const useLoader: RuleSetUseItem[] = [{
-              loader: `${TRANSFORM_LOADER}?unpluginName=${encodeURIComponent(plugin.name)}`,
+            const loaders: RuleSetUseItem[] = [{
+              loader: TRANSFORM_LOADER,
+              options: { plugin },
+              ident: plugin.name,
             }]
-            const useNone: RuleSetUseItem[] = []
             compiler.options.module.rules.unshift({
               enforce: plugin.enforce,
               use: (data: { resource: string | null; resourceQuery: string }) => {
                 if (data.resource == null)
-                  return useNone
+                  return []
 
                 const id = normalizeAbsolutePath(data.resource + (data.resourceQuery || ''))
                 if (!plugin.transformInclude || plugin.transformInclude(id))
-                  return useLoader
+                  return loaders
 
-                return useNone
+                return []
               },
             })
           }
@@ -173,7 +162,7 @@ export function getWebpackPlugin<UserOptions = {}>(
               use: [{
                 loader: LOAD_LOADER,
                 options: {
-                  unpluginName: plugin.name,
+                  plugin,
                 },
               }],
             })

diff --git a/src/webpack/loaders/load.ts b/src/webpack/loaders/load.ts
@@ -5,8 +5,8 @@ import { normalizeAbsolutePath } from '../../utils'
 
 export default async function load(this: LoaderContext<any>, source: string, map: any) {
   const callback = this.async()
-  const { unpluginName } = this.query
-  const plugin = this._compiler?.$unpluginContext[unpluginName]
+  const { plugin } = this.query
+
   let id = this.resource
 
   if (!plugin?.load || !id)

diff --git a/src/webpack/loaders/transform.ts b/src/webpack/loaders/transform.ts
@@ -4,17 +4,7 @@ import { createContext } from '../context'
 
 export default async function transform(this: LoaderContext<any>, source: string, map: any) {
   const callback = this.async()
-
-  let unpluginName
-  if (typeof this.query === 'string') {
-    const query = new URLSearchParams(this.query)
-    unpluginName = query.get('unpluginName')
-  }
-  else {
-    unpluginName = this.query.unpluginName
-  }
-
-  const plugin = this._compiler?.$unpluginContext[unpluginName]
+  const { plugin } = this.query
 
   if (!plugin?.transform)
     return callback(null, source, map)