@serwist/webpack-plugin 9.0.0-preview.10 → 9.0.0-preview.11

package/dist/index.internal.js

@@ -1,4 +1,3 @@
-import webpack from 'webpack';
 import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
 import 'upath';
 
@@ -6,12 +5,18 @@ class ChildCompilationPlugin {
     src;
     dest;
     plugins;
+    webpack;
     constructor({ src, dest, plugins }){
         this.src = src;
         this.dest = dest;
         this.plugins = plugins;
+        this.webpack = null;
+    }
+    propagateWebpackConfig(compiler) {
+        this.webpack = compiler.webpack;
     }
     apply(compiler) {
+        this.propagateWebpackConfig(compiler);
         compiler.hooks.make.tapPromise(this.constructor.name, (compilation)=>this.performChildCompilation(compilation, compiler).catch((error)=>{
                 compilation.errors.push(error);
             }));
@@ -30,7 +35,7 @@ class ChildCompilationPlugin {
                 plugin?.apply(childCompiler);
             }
         }
-        new webpack.EntryPlugin(parentCompiler.context, this.src, this.constructor.name).apply(childCompiler);
+        new this.webpack.EntryPlugin(parentCompiler.context, this.src, this.constructor.name).apply(childCompiler);
         await new Promise((resolve, reject)=>{
             childCompiler.runAsChild((error, _entries, childCompilation)=>{
                 if (error) {

package/dist/index.js

@@ -2,7 +2,6 @@ import { transformManifest, getSourceMapURL, validateWebpackInjectManifestOption
 import stringify from 'fast-json-stable-stringify';
 import prettyBytes from 'pretty-bytes';
 import upath from 'upath';
-import webpack from 'webpack';
 import crypto from 'crypto';
 import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
 
@@ -31,7 +30,7 @@ const checkConditions = (asset, compilation, conditions = [])=>{
                 compilation
             });
         }
-        if (webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
+        if (compilation.compiler.webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
             return true;
         }
     }
@@ -151,15 +150,19 @@ const _generatedAssetNames = new Set();
 class InjectManifest {
     config;
     alreadyCalled;
+    webpack;
     constructor(config){
         this.config = config;
         this.alreadyCalled = false;
+        this.webpack = null;
     }
-    propagateWebpackConfig() {
+    propagateWebpackConfig(compiler) {
+        this.webpack = compiler.webpack;
         const parsedSwSrc = upath.parse(this.config.swSrc);
-        this.config = Object.assign({
-            swDest: `${parsedSwSrc.name}.js`
-        }, this.config);
+        this.config = {
+            swDest: `${parsedSwSrc.name}.js`,
+            ...this.config
+        };
     }
     async getManifestEntries(compilation, config) {
         if (config.disablePrecacheManifest) {
@@ -190,11 +193,11 @@ class InjectManifest {
         };
     }
     apply(compiler) {
-        this.propagateWebpackConfig();
+        this.propagateWebpackConfig(compiler);
         compiler.hooks.make.tapPromise(this.constructor.name, (compilation)=>this.handleMake(compilation, compiler).catch((error)=>{
                 compilation.errors.push(error);
             }));
-        const { PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER } = webpack.Compilation;
+        const { PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER } = this.webpack.Compilation;
         compiler.hooks.thisCompilation.tap(this.constructor.name, (compilation)=>{
             compilation.hooks.processAssets.tapPromise({
                 name: this.constructor.name,
@@ -217,7 +220,7 @@ class InjectManifest {
                 plugin.apply(childCompiler);
             }
         }
-        new webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
+        new this.webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
         await new Promise((resolve, reject)=>{
             childCompiler.runAsChild((error, _entries, childCompilation)=>{
                 if (error) {
@@ -232,7 +235,7 @@ class InjectManifest {
     }
     addSrcToAssets(compilation, parentCompiler) {
         const source = parentCompiler.inputFileSystem.readFileSync(this.config.swSrc);
-        compilation.emitAsset(this.config.swDest, new webpack.sources.RawSource(source));
+        compilation.emitAsset(this.config.swDest, new this.webpack.sources.RawSource(source));
     }
     async handleMake(compilation, parentCompiler) {
         this.config = await validateWebpackInjectManifestOptions(this.config);
@@ -273,10 +276,10 @@ class InjectManifest {
                 replaceString: manifestString,
                 searchString: config.injectionPoint
             });
-            compilation.updateAsset(sourcemapAssetName, new webpack.sources.RawSource(map));
-            compilation.updateAsset(config.swDest, new webpack.sources.RawSource(source));
+            compilation.updateAsset(sourcemapAssetName, new this.webpack.sources.RawSource(map));
+            compilation.updateAsset(config.swDest, new this.webpack.sources.RawSource(source));
         } else {
-            compilation.updateAsset(config.swDest, new webpack.sources.RawSource(swAssetString.replace(config.injectionPoint, manifestString)));
+            compilation.updateAsset(config.swDest, new this.webpack.sources.RawSource(swAssetString.replace(config.injectionPoint, manifestString)));
         }
         if (compilation.getLogger) {
             const logger = compilation.getLogger(this.constructor.name);

package/dist/inject-manifest.d.ts

@@ -1,5 +1,5 @@
 import type { WebpackInjectManifestOptions } from "@serwist/build";
-import webpack from "webpack";
+import type { Compiler } from "webpack";
 /**
  * This class supports compiling a service worker file provided via `swSrc`,
  * and injecting into that service worker a list of URLs and revision
@@ -25,6 +25,7 @@ import webpack from "webpack";
 export declare class InjectManifest {
     protected config: WebpackInjectManifestOptions;
     private alreadyCalled;
+    private webpack;
     /**
      * Creates an instance of InjectManifest.
      */
@@ -34,53 +35,45 @@ export declare class InjectManifest {
      *
      * @private
      */
-    propagateWebpackConfig(): void;
+    private propagateWebpackConfig;
     /**
      * `getManifestEntriesFromCompilation` with a few additional checks.
      *
      * @private
      */
-    getManifestEntries(compilation: webpack.Compilation, config: WebpackInjectManifestOptions): Promise<{
-        size: number;
-        sortedEntries: {
-            revision: string | null;
-            url: string;
-            integrity?: string | undefined;
-        }[] | undefined;
-        manifestString: string;
-    }>;
+    private getManifestEntries;
     /**
      * @param compiler default compiler object passed from webpack
      *
      * @private
      */
-    apply(compiler: webpack.Compiler): void;
+    apply(compiler: Compiler): void;
     /**
      * @param compilation The webpack compilation.
      * @param parentCompiler The webpack parent compiler.
      *
      * @private
      */
-    performChildCompilation(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void>;
+    private performChildCompilation;
     /**
      * @param compilation The webpack compilation.
      * @param parentCompiler The webpack parent compiler.
      *
      * @private
      */
-    addSrcToAssets(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): void;
+    private addSrcToAssets;
     /**
      * @param compilation The webpack compilation.
      * @param parentCompiler The webpack parent compiler.
      *
      * @private
      */
-    handleMake(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void>;
+    private handleMake;
     /**
      * @param compilation The webpack compilation.
      *
      * @private
      */
-    addAssets(compilation: webpack.Compilation): Promise<void>;
+    private addAssets;
 }
 //# sourceMappingURL=inject-manifest.d.ts.map

package/dist/inject-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAMnE,OAAO,OAAO,MAAM,SAAS,CAAC;AAU9B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,4BAA4B,CAAC;IAC/C,OAAO,CAAC,aAAa,CAAU;IAE/B;;OAEG;gBACS,MAAM,EAAE,4BAA4B;IAKhD;;;;OAIG;IACH,sBAAsB,IAAI,IAAI;IAa9B;;;;OAIG;IACG,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,4BAA4B;;;;;;;;;IAwC/F;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;IA4BvC;;;;;OAKG;IACG,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiChH;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;IAMxF;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBnG;;;;OAIG;IACG,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAmDjE"}
+{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAKnE,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AAUvF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,4BAA4B,CAAC;IAC/C,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;gBACS,MAAM,EAAE,4BAA4B;IAMhD;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;YACW,kBAAkB;IAwChC;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA6B/B;;;;;OAKG;YACW,uBAAuB;IAiCrC;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;YACW,UAAU;IAiBxB;;;;OAIG;YACW,SAAS;CAmDxB"}

package/dist/lib/child-compilation-plugin.d.ts

@@ -1,5 +1,4 @@
-import type { WebpackPluginInstance } from "webpack";
-import webpack from "webpack";
+import type { Compiler, WebpackPluginInstance, default as Webpack } from "webpack";
 export interface ChildCompilationPluginOptions {
     src: string;
     dest: string;
@@ -14,8 +13,26 @@ export declare class ChildCompilationPlugin implements WebpackPluginInstance {
     src: string;
     dest: string;
     plugins: WebpackPluginInstance[] | undefined;
+    webpack: typeof Webpack;
     constructor({ src, dest, plugins }: ChildCompilationPluginOptions);
-    apply(compiler: webpack.Compiler): void;
-    performChildCompilation(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void>;
+    /**
+     * @param compiler default compiler object passed from webpack
+     *
+     * @private
+     */
+    private propagateWebpackConfig;
+    /**
+     * @param compiler default compiler object passed from webpack
+     *
+     * @private
+     */
+    apply(compiler: Compiler): void;
+    /**
+     * @param compilation The webpack compilation.
+     * @param parentCompiler The webpack parent compiler.
+     *
+     * @private
+     */
+    private performChildCompilation;
 }
 //# sourceMappingURL=child-compilation-plugin.d.ts.map

package/dist/lib/child-compilation-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"child-compilation-plugin.d.ts","sourceRoot":"","sources":["../../src/lib/child-compilation-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,qBAAqB,EAAE,CAAC;CACnC;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;gBACjC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAA6B;IAKjE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAO1B,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAiCjH"}
+{"version":3,"file":"child-compilation-plugin.d.ts","sourceRoot":"","sources":["../../src/lib/child-compilation-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,QAAQ,EAAgB,qBAAqB,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,SAAS,CAAC;AAI9G,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,qBAAqB,EAAE,CAAC;CACnC;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;IAC7C,OAAO,EAAE,OAAO,OAAO,CAAC;gBACZ,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAA6B;IAMjE;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAG9B;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ;IASxB;;;;;OAKG;YACW,uBAAuB;CAiCtC"}

package/dist/lib/get-manifest-entries-from-compilation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-manifest-entries-from-compilation.d.ts","sourceRoot":"","sources":["../../src/lib/get-manifest-entries-from-compilation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,aAAa,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAE/F,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAwKvE,eAAO,MAAM,iCAAiC,gBAC/B,WAAW,UAChB,4BAA4B;UACnB,MAAM;mBAAiB,aAAa,EAAE,GAAG,SAAS;EAgCpE,CAAC"}
+{"version":3,"file":"get-manifest-entries-from-compilation.d.ts","sourceRoot":"","sources":["../../src/lib/get-manifest-entries-from-compilation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,aAAa,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAE/F,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAuKvE,eAAO,MAAM,iCAAiC,gBAC/B,WAAW,UAChB,4BAA4B;UACnB,MAAM;mBAAiB,aAAa,EAAE,GAAG,SAAS;EAgCpE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "9.0.0-preview.10",
+  "version": "9.0.0-preview.11",
   "type": "module",
   "description": "A plugin for your Webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -49,7 +49,7 @@
     "fast-json-stable-stringify": "2.1.0",
     "pretty-bytes": "6.1.1",
     "upath": "2.0.1",
-    "@serwist/build": "9.0.0-preview.10"
+    "@serwist/build": "9.0.0-preview.11"
   },
   "devDependencies": {
     "@types/node": "20.11.16",
@@ -57,7 +57,7 @@
     "rollup": "4.9.6",
     "typescript": "5.4.0-dev.20240206",
     "webpack": "5.90.1",
-    "@serwist/constants": "9.0.0-preview.10"
+    "@serwist/constants": "9.0.0-preview.11"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",
@@ -66,6 +66,9 @@
   "peerDependenciesMeta": {
     "typescript": {
       "optional": true
+    },
+    "webpack": {
+      "optional": true
     }
   },
   "scripts": {

package/src/inject-manifest.ts

@@ -10,8 +10,7 @@ import { escapeRegExp, replaceAndUpdateSourceMap, validateWebpackInjectManifestO
 import stringify from "fast-json-stable-stringify";
 import prettyBytes from "pretty-bytes";
 import upath from "upath";
-import type { Compilation } from "webpack";
-import webpack from "webpack";
+import type { Compilation, Compiler, WebpackError, default as Webpack } from "webpack";
 
 import { getManifestEntriesFromCompilation } from "./lib/get-manifest-entries-from-compilation.js";
 import { getSourcemapAssetName } from "./lib/get-sourcemap-asset-name.js";
@@ -46,6 +45,7 @@ const _generatedAssetNames = new Set<string>();
 export class InjectManifest {
   protected config: WebpackInjectManifestOptions;
   private alreadyCalled: boolean;
+  private webpack: typeof Webpack;
 
   /**
    * Creates an instance of InjectManifest.
@@ -53,6 +53,7 @@ export class InjectManifest {
   constructor(config: WebpackInjectManifestOptions) {
     this.config = config;
     this.alreadyCalled = false;
+    this.webpack = null!;
   }
 
   /**
@@ -60,17 +61,17 @@ export class InjectManifest {
    *
    * @private
    */
-  propagateWebpackConfig(): void {
+  private propagateWebpackConfig(compiler: Compiler): void {
+    this.webpack = compiler.webpack;
+
     const parsedSwSrc = upath.parse(this.config.swSrc);
     // Because this.config is listed last, properties that are already set
     // there take precedence over derived properties from the compiler.
-    this.config = Object.assign(
-      {
-        // Use swSrc with a hardcoded .js extension, in case swSrc is a .ts file.
-        swDest: `${parsedSwSrc.name}.js`,
-      },
-      this.config,
-    );
+    this.config = {
+      // Use swSrc with a hardcoded .js extension, in case swSrc is a .ts file.
+      swDest: `${parsedSwSrc.name}.js`,
+      ...this.config,
+    };
   }
 
   /**
@@ -78,7 +79,7 @@ export class InjectManifest {
    *
    * @private
    */
-  async getManifestEntries(compilation: webpack.Compilation, config: WebpackInjectManifestOptions) {
+  private async getManifestEntries(compilation: Compilation, config: WebpackInjectManifestOptions) {
     if (config.disablePrecacheManifest) {
       return {
         size: 0,
@@ -92,7 +93,7 @@ export class InjectManifest {
       const warningMessage = `${this.constructor.name} has been called multiple times, perhaps due to running webpack in --watch mode. The precache manifest generated after the first call may be inaccurate! Please see https://github.com/GoogleChrome/workbox/issues/1790 for more information.`;
 
       if (!compilation.warnings.some((warning) => warning instanceof Error && warning.message === warningMessage)) {
-        compilation.warnings.push(new Error(warningMessage) as webpack.WebpackError);
+        compilation.warnings.push(new Error(warningMessage) as WebpackError);
       }
     } else {
       this.alreadyCalled = true;
@@ -123,16 +124,17 @@ export class InjectManifest {
    *
    * @private
    */
-  apply(compiler: webpack.Compiler): void {
-    this.propagateWebpackConfig();
+  apply(compiler: Compiler): void {
+    this.propagateWebpackConfig(compiler);
 
     compiler.hooks.make.tapPromise(this.constructor.name, (compilation) =>
-      this.handleMake(compilation, compiler).catch((error: webpack.WebpackError) => {
+      this.handleMake(compilation, compiler).catch((error: WebpackError) => {
         compilation.errors.push(error);
       }),
     );
 
-    const { PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER } = webpack.Compilation;
+    // webpack should not be null at this point.
+    const { PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER } = this.webpack.Compilation;
     // Specifically hook into thisCompilation, as per
     // https://github.com/webpack/webpack/issues/11425#issuecomment-690547848
     compiler.hooks.thisCompilation.tap(this.constructor.name, (compilation) => {
@@ -144,7 +146,7 @@ export class InjectManifest {
           stage: PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER - 10,
         },
         () =>
-          this.addAssets(compilation).catch((error: webpack.WebpackError) => {
+          this.addAssets(compilation).catch((error: WebpackError) => {
             compilation.errors.push(error);
           }),
       );
@@ -157,7 +159,7 @@ export class InjectManifest {
    *
    * @private
    */
-  async performChildCompilation(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void> {
+  private async performChildCompilation(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
     const outputOptions: Parameters<Compilation["createChildCompiler"]>["1"] = {
       filename: this.config.swDest,
     };
@@ -174,7 +176,7 @@ export class InjectManifest {
       }
     }
 
-    new webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
+    new this.webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
 
     await new Promise<void>((resolve, reject) => {
       childCompiler.runAsChild((error, _entries, childCompilation) => {
@@ -196,10 +198,9 @@ export class InjectManifest {
    *
    * @private
    */
-  addSrcToAssets(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): void {
-    // eslint-disable-next-line
+  private addSrcToAssets(compilation: Compilation, parentCompiler: Compiler): void {
     const source = (parentCompiler.inputFileSystem as any).readFileSync(this.config.swSrc);
-    compilation.emitAsset(this.config.swDest!, new webpack.sources.RawSource(source));
+    compilation.emitAsset(this.config.swDest!, new this.webpack.sources.RawSource(source));
   }
 
   /**
@@ -208,7 +209,7 @@ export class InjectManifest {
    *
    * @private
    */
-  async handleMake(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void> {
+  private async handleMake(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
     this.config = await validateWebpackInjectManifestOptions(this.config);
     this.config.swDest = relativeToOutputPath(compilation, this.config.swDest!);
     _generatedAssetNames.add(this.config.swDest);
@@ -220,9 +221,7 @@ export class InjectManifest {
       // This used to be a fatal error, but just warn at runtime because we
       // can't validate it easily.
       if (Array.isArray(this.config.webpackCompilationPlugins) && this.config.webpackCompilationPlugins.length > 0) {
-        compilation.warnings.push(
-          new Error("compileSrc is false, so the " + "webpackCompilationPlugins option will be ignored.") as webpack.WebpackError,
-        );
+        compilation.warnings.push(new Error("compileSrc is false, so the " + "webpackCompilationPlugins option will be ignored.") as WebpackError);
       }
     }
   }
@@ -232,7 +231,7 @@ export class InjectManifest {
    *
    * @private
    */
-  async addAssets(compilation: webpack.Compilation): Promise<void> {
+  private async addAssets(compilation: Compilation): Promise<void> {
     const config = Object.assign({}, this.config);
 
     const { size, sortedEntries, manifestString } = await this.getManifestEntries(compilation, config);
@@ -270,12 +269,12 @@ export class InjectManifest {
         searchString: config.injectionPoint!,
       });
 
-      compilation.updateAsset(sourcemapAssetName, new webpack.sources.RawSource(map));
-      compilation.updateAsset(config.swDest!, new webpack.sources.RawSource(source));
+      compilation.updateAsset(sourcemapAssetName, new this.webpack.sources.RawSource(map));
+      compilation.updateAsset(config.swDest!, new this.webpack.sources.RawSource(source));
     } else {
       // If there's no sourcemap associated with swDest, a simple string
       // replacement will suffice.
-      compilation.updateAsset(config.swDest!, new webpack.sources.RawSource(swAssetString.replace(config.injectionPoint!, manifestString)));
+      compilation.updateAsset(config.swDest!, new this.webpack.sources.RawSource(swAssetString.replace(config.injectionPoint!, manifestString)));
     }
 
     if (compilation.getLogger) {

package/src/lib/child-compilation-plugin.ts

@@ -1,5 +1,4 @@
-import type { Compilation, WebpackPluginInstance } from "webpack";
-import webpack from "webpack";
+import type { Compilation, Compiler, WebpackError, WebpackPluginInstance, default as Webpack } from "webpack";
 
 import { relativeToOutputPath } from "./relative-to-output-path.js";
 
@@ -18,19 +17,42 @@ export class ChildCompilationPlugin implements WebpackPluginInstance {
   src: string;
   dest: string;
   plugins: WebpackPluginInstance[] | undefined;
+  webpack: typeof Webpack;
   constructor({ src, dest, plugins }: ChildCompilationPluginOptions) {
     this.src = src;
     this.dest = dest;
     this.plugins = plugins;
+    this.webpack = null!;
   }
-  apply(compiler: webpack.Compiler) {
+  /**
+   * @param compiler default compiler object passed from webpack
+   *
+   * @private
+   */
+  private propagateWebpackConfig(compiler: Compiler): void {
+    this.webpack = compiler.webpack;
+  }
+  /**
+   * @param compiler default compiler object passed from webpack
+   *
+   * @private
+   */
+  apply(compiler: Compiler) {
+    this.propagateWebpackConfig(compiler);
+
     compiler.hooks.make.tapPromise(this.constructor.name, (compilation) =>
-      this.performChildCompilation(compilation, compiler).catch((error: webpack.WebpackError) => {
+      this.performChildCompilation(compilation, compiler).catch((error: WebpackError) => {
         compilation.errors.push(error);
       }),
     );
   }
-  async performChildCompilation(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void> {
+  /**
+   * @param compilation The webpack compilation.
+   * @param parentCompiler The webpack parent compiler.
+   *
+   * @private
+   */
+  private async performChildCompilation(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
     const resolvedDest = relativeToOutputPath(compilation, this.dest);
     const outputOptions: Parameters<Compilation["createChildCompiler"]>["1"] = {
       filename: resolvedDest,
@@ -48,7 +70,7 @@ export class ChildCompilationPlugin implements WebpackPluginInstance {
       }
     }
 
-    new webpack.EntryPlugin(parentCompiler.context, this.src, this.constructor.name).apply(childCompiler);
+    new this.webpack.EntryPlugin(parentCompiler.context, this.src, this.constructor.name).apply(childCompiler);
 
     await new Promise<void>((resolve, reject) => {
       childCompiler.runAsChild((error, _entries, childCompilation) => {

package/src/lib/get-manifest-entries-from-compilation.ts

@@ -9,7 +9,6 @@
 import type { FileDetails, ManifestEntry, WebpackInjectManifestOptions } from "@serwist/build";
 import { transformManifest } from "@serwist/build";
 import type { Asset, Chunk, Compilation, WebpackError } from "webpack";
-import webpack from "webpack";
 
 import { getAssetHash } from "./get-asset-hash.js";
 import { resolveWebpackURL } from "./resolve-webpack-url.js";
@@ -36,7 +35,7 @@ const checkConditions = (
       return condition({ asset, compilation });
       //return compilation !== null;
     }
-    if (webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
+    if (compilation.compiler.webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
       return true;
     }
   }