@serwist/webpack-plugin 9.0.5 → 9.0.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Google LLC, 2019 ShadowWalker w@weiw.io https://weiw.io, 2023 Serwist
+Copyright (c) 2018-2023 Google LLC, 2019-2023 ShadowWalker w@weiw.io https://weiw.io, 2020-2023 Anthony Fu <https://github.com/antfu>, 2023-PRESENT Serwist
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/chunks/perform-child-compilation.js

@@ -0,0 +1,33 @@
+import path from 'node:path';
+
+const relativeToOutputPath = (compilation, originalPath)=>{
+    if (path.resolve(originalPath) === path.normalize(originalPath)) {
+        return path.relative(compilation.options.output.path, originalPath);
+    }
+    return originalPath;
+};
+
+const performChildCompilation = async (compiler, compilation, name, src, dest, plugins)=>{
+    const childCompiler = compilation.createChildCompiler(name, {
+        filename: dest
+    }, plugins);
+    new compiler.webpack.webworker.WebWorkerTemplatePlugin().apply(childCompiler);
+    new compiler.webpack.EntryPlugin(compiler.context, src, name).apply(childCompiler);
+    await new Promise((resolve, reject)=>{
+        childCompiler.runAsChild((error, _entries, childCompilation)=>{
+            if (error) {
+                reject(error);
+            } else {
+                if (childCompilation?.warnings) {
+                    compilation.warnings.push(...childCompilation.warnings);
+                }
+                if (childCompilation?.errors) {
+                    compilation.errors.push(...childCompilation.errors);
+                }
+                resolve();
+            }
+        });
+    });
+};
+
+export { performChildCompilation as p, relativeToOutputPath as r };

package/dist/index.internal.js

@@ -1,54 +1,20 @@
-import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
-import 'upath';
+import { p as performChildCompilation, r as relativeToOutputPath } from './chunks/perform-child-compilation.js';
+import 'node:path';
 
 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)=>{
+        compiler.hooks.make.tapPromise(this.constructor.name, (compilation)=>performChildCompilation(compiler, compilation, this.constructor.name, this.src, relativeToOutputPath(compilation, this.dest), this.plugins).catch((error)=>{
                 compilation.errors.push(error);
             }));
     }
-    async performChildCompilation(compilation, parentCompiler) {
-        const resolvedDest = relativeToOutputPath(compilation, this.dest);
-        const outputOptions = {
-            filename: resolvedDest
-        };
-        const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
-        childCompiler.options.target = "webworker";
-        childCompiler.context = parentCompiler.context;
-        childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-        childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-        if (this.plugins !== undefined) {
-            for (const plugin of this.plugins){
-                plugin?.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) {
-                    reject(error);
-                } else {
-                    compilation.warnings = compilation.warnings.concat(childCompilation?.warnings ?? []);
-                    compilation.errors = compilation.errors.concat(childCompilation?.errors ?? []);
-                    resolve();
-                }
-            });
-        });
-    }
 }
 
 export { ChildCompilationPlugin, relativeToOutputPath };

package/dist/index.js

@@ -1,9 +1,13 @@
+import path from 'node:path';
 import { transformManifest, getSourceMapURL, stringify, escapeRegExp, replaceAndUpdateSourceMap } from '@serwist/build';
 import prettyBytes from 'pretty-bytes';
-import upath from 'upath';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 import crypto from 'node:crypto';
-import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
+import { r as relativeToOutputPath, p as performChildCompilation } from './chunks/perform-child-compilation.js';
+
+const toUnix = (p)=>{
+    return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
+};
 
 const validateInjectManifestOptions = async (input)=>{
     const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
@@ -151,8 +155,8 @@ const getManifestEntriesFromCompilation = async (compilation, config)=>{
 const getSourcemapAssetName = (compilation, swContents, swDest)=>{
     const url = getSourceMapURL(swContents);
     if (url) {
-        const swAssetDirname = upath.dirname(swDest);
-        const sourcemapURLAssetName = upath.normalize(upath.join(swAssetDirname, url));
+        const swAssetDirname = path.dirname(swDest);
+        const sourcemapURLAssetName = path.normalize(path.join(swAssetDirname, url));
         if (compilation.getAsset(sourcemapURLAssetName)) {
             return sourcemapURLAssetName;
         }
@@ -172,7 +176,7 @@ class InjectManifest {
     }
     propagateWebpackConfig(compiler) {
         this.webpack = compiler.webpack;
-        const parsedSwSrc = upath.parse(this.config.swSrc);
+        const parsedSwSrc = path.parse(this.config.swSrc);
         this.config = {
             swDest: `${parsedSwSrc.name}.js`,
             ...this.config
@@ -208,7 +212,7 @@ class InjectManifest {
     }
     apply(compiler) {
         this.propagateWebpackConfig(compiler);
-        compiler.hooks.make.tapPromise(this.constructor.name, (compilation)=>this.handleMake(compilation, compiler).catch((error)=>{
+        compiler.hooks.make.tapPromise(this.constructor.name, (compilation)=>this.handleMake(compiler, compilation).catch((error)=>{
                 compilation.errors.push(error);
             }));
         const { PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER } = this.webpack.Compilation;
@@ -221,48 +225,18 @@ class InjectManifest {
                 }));
         });
     }
-    async performChildCompilation(compilation, parentCompiler) {
-        const outputOptions = {
-            filename: this.config.swDest
-        };
-        const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
-        childCompiler.context = parentCompiler.context;
-        childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-        childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-        if (Array.isArray(this.config.webpackCompilationPlugins)) {
-            for (const plugin of this.config.webpackCompilationPlugins){
-                plugin.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) {
-                    reject(error);
-                } else {
-                    if (childCompilation?.warnings) {
-                        compilation.warnings.push(...childCompilation.warnings);
-                    }
-                    if (childCompilation?.errors) {
-                        compilation.errors.push(...childCompilation.errors);
-                    }
-                    resolve();
-                }
-            });
-        });
-    }
-    addSrcToAssets(compilation, parentCompiler) {
-        const source = parentCompiler.inputFileSystem.readFileSync(this.config.swSrc);
+    addSrcToAssets(compiler, compilation) {
+        const source = compiler.inputFileSystem.readFileSync(this.config.swSrc);
         compilation.emitAsset(this.config.swDest, new this.webpack.sources.RawSource(source));
     }
-    async handleMake(compilation, parentCompiler) {
+    async handleMake(compiler, compilation) {
         this.config = await validateInjectManifestOptions(this.config);
         this.config.swDest = relativeToOutputPath(compilation, this.config.swDest);
         _generatedAssetNames.add(this.config.swDest);
         if (this.config.compileSrc) {
-            await this.performChildCompilation(compilation, parentCompiler);
+            await performChildCompilation(compiler, compilation, this.constructor.name, this.config.swSrc, this.config.swDest, this.config.webpackCompilationPlugins);
         } else {
-            this.addSrcToAssets(compilation, parentCompiler);
+            this.addSrcToAssets(compiler, compilation);
             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."));
             }
@@ -271,8 +245,7 @@ class InjectManifest {
     async addAssets(compilation) {
         const config = Object.assign({}, this.config);
         const { size, sortedEntries, manifestString } = await this.getManifestEntries(compilation, config);
-        const absoluteSwSrc = upath.resolve(config.swSrc);
-        compilation.fileDependencies.add(absoluteSwSrc);
+        compilation.fileDependencies.add(path.resolve(config.swSrc));
         const swAsset = compilation.getAsset(config.swDest);
         const swAssetString = swAsset.source.source().toString();
         const globalRegexp = new RegExp(escapeRegExp(config.injectionPoint), "g");
@@ -288,7 +261,7 @@ class InjectManifest {
             _generatedAssetNames.add(sourcemapAssetName);
             const sourcemapAsset = compilation.getAsset(sourcemapAssetName);
             const { source, map } = await replaceAndUpdateSourceMap({
-                jsFilename: config.swDest,
+                jsFilename: toUnix(config.swDest),
                 originalMap: JSON.parse(sourcemapAsset.source.source().toString()),
                 originalSource: swAssetString,
                 replaceString: manifestString,

package/dist/inject-manifest.d.ts

@@ -49,22 +49,15 @@ export declare class InjectManifest {
      */
     apply(compiler: Compiler): void;
     /**
+     * @param compiler The webpack parent compiler.
      * @param compilation The webpack compilation.
-     * @param parentCompiler The webpack parent compiler.
-     *
-     * @private
-     */
-    private performChildCompilation;
-    /**
-     * @param compilation The webpack compilation.
-     * @param parentCompiler The webpack parent compiler.
      *
      * @private
      */
     private addSrcToAssets;
     /**
+     * @param compiler The webpack parent compiler.
      * @param compilation The webpack compilation.
-     * @param parentCompiler The webpack parent compiler.
      *
      * @private
      */

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

@@ -1 +1 @@
-{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAW3F;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,6BAA6B,CAAC;IAChD,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;gBACS,MAAM,EAAE,qBAAqB;IAOzC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;YACW,kBAAkB;IAwChC;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA6B/B;;;;;OAKG;YACW,uBAAuB;IAoCrC;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;YACW,UAAU;IAiBxB;;;;OAIG;YACW,SAAS;CAmDxB"}
+{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAW3F;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,6BAA6B,CAAC;IAChD,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;gBACS,MAAM,EAAE,qBAAqB;IAQzC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;YACW,kBAAkB;IAuChC;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA6B/B;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;YACW,UAAU;IAwBxB;;;;OAIG;YACW,SAAS;CAiDxB"}

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

@@ -1,4 +1,4 @@
-import type { Compiler, WebpackPluginInstance, default as Webpack } from "webpack";
+import type { Compiler, WebpackPluginInstance } from "webpack";
 export interface ChildCompilationPluginOptions {
     src: string;
     dest: string;
@@ -13,26 +13,12 @@ export declare class ChildCompilationPlugin implements WebpackPluginInstance {
     src: string;
     dest: string;
     plugins: WebpackPluginInstance[] | undefined;
-    webpack: typeof Webpack;
     constructor({ src, dest, plugins }: ChildCompilationPluginOptions);
-    /**
-     * @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,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"}
+{"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,MAAM,SAAS,CAAC;AAK7E,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;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ;CAczB"}

package/dist/lib/get-script-files-for-chunks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-script-files-for-chunks.d.ts","sourceRoot":"","sources":["../../src/lib/get-script-files-for-chunks.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIzD,eAAO,MAAM,uBAAuB,gBAAiB,WAAW,cAAc,MAAM,EAAE,KAAG,MAAM,EAwB9F,CAAC"}
+{"version":3,"file":"get-script-files-for-chunks.d.ts","sourceRoot":"","sources":["../../src/lib/get-script-files-for-chunks.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIzD,eAAO,MAAM,uBAAuB,gBAAiB,WAAW,cAAc,MAAM,EAAE,KAAG,MAAM,EAwB9F,CAAC"}

package/dist/lib/get-sourcemap-asset-name.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-sourcemap-asset-name.d.ts","sourceRoot":"","sources":["../../src/lib/get-sourcemap-asset-name.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,gBAAiB,WAAW,cAAc,MAAM,UAAU,MAAM,KAAG,MAAM,GAAG,SAiB7G,CAAC"}
+{"version":3,"file":"get-sourcemap-asset-name.d.ts","sourceRoot":"","sources":["../../src/lib/get-sourcemap-asset-name.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,gBAAiB,WAAW,cAAc,MAAM,UAAU,MAAM,KAAG,MAAM,GAAG,SAgB7G,CAAC"}

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

@@ -0,0 +1,16 @@
+import type { Compilation, Compiler } from "webpack";
+import type { WebpackPlugin } from "./types.js";
+/**
+ * Perform a child compilation.
+ *
+ * @param compiler The parent webpack compiler.
+ * @param compilation The webpack compilation.
+ * @param name The name of the child compiler.
+ * @param src The source file. Should be absolute.
+ * @param dest The destination file. Should be relative to the compilation.
+ * @param plugins Additional webpack plugins.
+ *
+ * @private
+ */
+export declare const performChildCompilation: (compiler: Compiler, compilation: Compilation, name: string, src: string, dest: string, plugins: WebpackPlugin[] | undefined) => Promise<void>;
+//# sourceMappingURL=perform-child-compilation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"perform-child-compilation.d.ts","sourceRoot":"","sources":["../../src/lib/perform-child-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,uBAAuB,aACxB,QAAQ,eACL,WAAW,QAClB,MAAM,OACP,MAAM,QACL,MAAM,WACH,aAAa,EAAE,GAAG,SAAS,kBAuBrC,CAAC"}

package/dist/lib/relative-to-output-path.d.ts

@@ -1,12 +1,12 @@
 import type { Compilation } from "webpack";
 /**
  * @param compilation The webpack compilation.
- * @param path The original path value.
+ * @param originalPath The original path value.
  *
  * @returns If path was not absolute, the returns path as-is.
  * Otherwise, returns path relative to the compilation's output path.
  *
  * @private
  */
-export declare const relativeToOutputPath: (compilation: Compilation, path: string) => string;
+export declare const relativeToOutputPath: (compilation: Compilation, originalPath: string) => string;
 //# sourceMappingURL=relative-to-output-path.d.ts.map

package/dist/lib/relative-to-output-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relative-to-output-path.d.ts","sourceRoot":"","sources":["../../src/lib/relative-to-output-path.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,QAAQ,MAAM,KAAG,MAQ7E,CAAC"}
+{"version":3,"file":"relative-to-output-path.d.ts","sourceRoot":"","sources":["../../src/lib/relative-to-output-path.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,gBAAgB,MAAM,KAAG,MAQrF,CAAC"}

package/dist/lib/schema.d.ts

@@ -10,8 +10,8 @@ export declare const webpackPartial: z.ZodObject<{
     excludeChunks?: string[] | undefined;
     include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
 }, {
-    chunks?: string[] | undefined;
     exclude?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
+    chunks?: string[] | undefined;
     excludeChunks?: string[] | undefined;
     include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
 }>;
@@ -21,12 +21,12 @@ export declare const injectPartial: z.ZodObject<{
     webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny, "many">>;
 }, "strict", z.ZodTypeAny, {
     compileSrc: boolean;
-    swDest?: string | undefined;
     webpackCompilationPlugins?: any[] | undefined;
+    swDest?: string | undefined;
 }, {
     compileSrc?: boolean | undefined;
-    swDest?: string | undefined;
     webpackCompilationPlugins?: any[] | undefined;
+    swDest?: string | undefined;
 }>;
 export declare const injectManifestOptions: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
     additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
@@ -157,7 +157,6 @@ export declare const injectManifestOptions: z.ZodObject<z.objectUtil.extendShape
     chunks?: string[] | undefined;
     excludeChunks?: string[] | undefined;
     include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    swDest?: string | undefined;
     webpackCompilationPlugins?: any[] | undefined;
     additionalPrecacheEntries?: (string | {
         url: string;
@@ -188,14 +187,14 @@ export declare const injectManifestOptions: z.ZodObject<z.objectUtil.extendShape
         warnings?: string[] | undefined;
     }>)[] | undefined;
     modifyURLPrefix?: Record<string, string> | undefined;
+    swDest?: string | undefined;
 }, {
     swSrc: string;
-    chunks?: string[] | undefined;
     exclude?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
+    chunks?: string[] | undefined;
     excludeChunks?: string[] | undefined;
     include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
     compileSrc?: boolean | undefined;
-    swDest?: string | undefined;
     webpackCompilationPlugins?: any[] | undefined;
     additionalPrecacheEntries?: (string | {
         url: string;
@@ -229,5 +228,6 @@ export declare const injectManifestOptions: z.ZodObject<z.objectUtil.extendShape
     maximumFileSizeToCacheInBytes?: number | undefined;
     modifyURLPrefix?: Record<string, string> | undefined;
     injectionPoint?: string | undefined;
+    swDest?: string | undefined;
 }>;
 //# sourceMappingURL=schema.d.ts.map

package/dist/lib/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;EASmC,CAAC;AAE/D,eAAO,MAAM,aAAa;;;;;;;;;;;;EAMkD,CAAC;AAE7E,eAAO,MAAM,qBAAqB;;;;;;;iBAdL,CAAC;gBACV,CAAC;;;iBACyB,CAAC;gBAAsC,CAAC;;;;;;;;;;;;;iBAiBnC,CAAC;gBACxC,CAAC;;;;iBAAkG,CAAC;gBAAsC,CAAC;;;;;;;;;;;qBAAye,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;qBAA8Z,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA3U,CAAC;oBAA0C,CAAC;;;;;;;qBAAhtC,CAAC;oBAA0C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA41C,CAAC;oBAA0C,CAAC;;;;;;;qBAAhtC,CAAC;oBAA0C,CAAC;;;;;;;EAD/vC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;EASmC,CAAC;AAE/D,eAAO,MAAM,aAAa;;;;;;;;;;;;EAMkD,CAAC;AAE7E,eAAO,MAAM,qBAAqB;;;;;;;iBAdL,CAAC;gBACV,CAAC;;;iBACyB,CAAC;gBAAsC,CAAC;;;;;;;;;;;;;iBAiBnC,CAAC;gBACxC,CAAC;;;;iBAAkG,CAAC;gBAAsC,CAAC;;;;;;;;;;;qBAAye,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;qBAA8Z,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA3U,CAAC;oBAA0C,CAAC;;;;;;;qBAAhtC,CAAC;oBAA0C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA41C,CAAC;oBAA0C,CAAC;;;;;;;qBAAhtC,CAAC;oBAA0C,CAAC;;;;;;;;EAD/vC,CAAC"}

package/dist/lib/types.d.ts

@@ -1,5 +1,6 @@
 import type { BasePartial, BaseResolved, InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, OptionalSwDestPartial, OptionalSwDestResolved } from "@serwist/build";
 import type { Require } from "@serwist/utils";
+import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
 export interface WebpackPartial {
     /**
      * One or more chunk names whose corresponding output files should be included
@@ -44,11 +45,12 @@ export interface InjectPartial {
      * Optional webpack plugins that will be used when compiling the `swSrc`
      * file. Only valid if `compileSrc` is `true`.
      */
-    webpackCompilationPlugins?: any[];
+    webpackCompilationPlugins?: WebpackPlugin[];
 }
 export type InjectResolved = Require<InjectPartial, "compileSrc">;
 export interface InjectManifestOptions extends BasePartial, WebpackPartial, BaseInjectPartial, OptionalSwDestPartial, InjectPartial {
 }
 export interface InjectManifestOptionsComplete extends BaseResolved, WebpackResolved, BaseInjectResolved, OptionalSwDestResolved, InjectResolved {
 }
+export type WebpackPlugin = WebpackPluginFunction | WebpackPluginInstance;
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;CAC1D;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,GAAG,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa;CAAG;AAEtI,MAAM,WAAW,6BAA8B,SAAQ,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,cAAc;CAAG"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAE5E,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;CAC1D;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa;CAAG;AAEtI,MAAM,WAAW,6BAA8B,SAAQ,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,cAAc;CAAG;AAEnJ,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "9.0.5",
+  "version": "9.0.7",
   "type": "module",
   "description": "A plugin for your webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -22,7 +22,10 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "author": "Google's Web DevRel Team, Serwist's Team",
+  "author": "Google's Web DevRel Team",
+  "contributors": [
+    "Serwist <ducanh2912.rusty@gmail.com> (https://serwist.pages.dev/)"
+  ],
   "license": "MIT",
   "repository": "https://github.com/serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
@@ -56,18 +59,17 @@
   },
   "dependencies": {
     "pretty-bytes": "6.1.1",
-    "upath": "2.0.1",
     "zod": "3.23.8",
-    "@serwist/build": "9.0.5"
+    "@serwist/build": "9.0.7"
   },
   "devDependencies": {
-    "@types/node": "20.14.10",
+    "@types/node": "22.5.0",
     "@types/webpack": "5.28.5",
-    "rollup": "4.18.1",
-    "typescript": "5.5.3",
+    "rollup": "4.21.0",
+    "typescript": "5.5.4",
     "webpack": "5.93.0",
-    "@serwist/configs": "9.0.5",
-    "@serwist/utils": "9.0.5"
+    "@serwist/configs": "9.0.7",
+    "@serwist/utils": "9.0.7"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

package/src/inject-manifest.ts

@@ -1,13 +1,14 @@
+import path from "node:path";
 import { escapeRegExp, replaceAndUpdateSourceMap, stringify } from "@serwist/build";
+import { toUnix } from "@serwist/utils";
 import prettyBytes from "pretty-bytes";
-import upath from "upath";
 import type { Compilation, Compiler, WebpackError, default as Webpack } from "webpack";
 import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./lib/types.js";
 import { validateInjectManifestOptions } from "./lib/validator.js";
-
 import { getManifestEntriesFromCompilation } from "./lib/get-manifest-entries-from-compilation.js";
 import { getSourcemapAssetName } from "./lib/get-sourcemap-asset-name.js";
 import { relativeToOutputPath } from "./lib/relative-to-output-path.js";
+import { performChildCompilation } from "./lib/perform-child-compilation.js";
 
 // Used to keep track of swDest files written by *any* instance of this plugin.
 // See https://github.com/GoogleChrome/workbox/issues/2181
@@ -44,7 +45,8 @@ export class InjectManifest {
    * Creates an instance of InjectManifest.
    */
   constructor(config: InjectManifestOptions) {
-    // We are essentially lying to TypeScript.
+    // We are essentially lying to TypeScript. When `handleMake`
+    // is called, `this.config` will be replaced by a validated config.
     this.config = config as InjectManifestOptionsComplete;
     this.alreadyCalled = false;
     this.webpack = null!;
@@ -58,7 +60,7 @@ export class InjectManifest {
   private propagateWebpackConfig(compiler: Compiler): void {
     this.webpack = compiler.webpack;
 
-    const parsedSwSrc = upath.parse(this.config.swSrc);
+    const parsedSwSrc = path.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 = {
@@ -95,8 +97,7 @@ export class InjectManifest {
 
     // Ensure that we don't precache any of the assets generated by *any*
     // instance of this plugin.
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    config.exclude!.push(({ asset }) => _generatedAssetNames.has(asset.name));
+    config.exclude.push(({ asset }) => _generatedAssetNames.has(asset.name));
 
     const { size, sortedEntries } = await getManifestEntriesFromCompilation(compilation, config);
 
@@ -122,7 +123,7 @@ export class InjectManifest {
     this.propagateWebpackConfig(compiler);
 
     compiler.hooks.make.tapPromise(this.constructor.name, (compilation) =>
-      this.handleMake(compilation, compiler).catch((error: WebpackError) => {
+      this.handleMake(compiler, compilation).catch((error: WebpackError) => {
         compilation.errors.push(error);
       }),
     );
@@ -148,73 +149,38 @@ export class InjectManifest {
   }
 
   /**
+   * @param compiler The webpack parent compiler.
    * @param compilation The webpack compilation.
-   * @param parentCompiler The webpack parent compiler.
    *
    * @private
    */
-  private async performChildCompilation(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
-    const outputOptions: Parameters<Compilation["createChildCompiler"]>["1"] = {
-      filename: this.config.swDest,
-    };
-
-    const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
-
-    childCompiler.context = parentCompiler.context;
-    childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-    childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-
-    if (Array.isArray(this.config.webpackCompilationPlugins)) {
-      for (const plugin of this.config.webpackCompilationPlugins) {
-        plugin.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) => {
-        if (error) {
-          reject(error);
-        } else {
-          if (childCompilation?.warnings) {
-            compilation.warnings.push(...childCompilation.warnings);
-          }
-          if (childCompilation?.errors) {
-            compilation.errors.push(...childCompilation.errors);
-          }
-          resolve();
-        }
-      });
-    });
-  }
-
-  /**
-   * @param compilation The webpack compilation.
-   * @param parentCompiler The webpack parent compiler.
-   *
-   * @private
-   */
-  private addSrcToAssets(compilation: Compilation, parentCompiler: Compiler): void {
-    const source = (parentCompiler.inputFileSystem as any).readFileSync(this.config.swSrc);
+  private addSrcToAssets(compiler: Compiler, compilation: Compilation): void {
+    const source = compiler.inputFileSystem!.readFileSync!(this.config.swSrc);
     compilation.emitAsset(this.config.swDest!, new this.webpack.sources.RawSource(source));
   }
 
   /**
+   * @param compiler The webpack parent compiler.
    * @param compilation The webpack compilation.
-   * @param parentCompiler The webpack parent compiler.
    *
    * @private
    */
-  private async handleMake(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
+  private async handleMake(compiler: Compiler, compilation: Compilation): Promise<void> {
     this.config = await validateInjectManifestOptions(this.config);
     this.config.swDest = relativeToOutputPath(compilation, this.config.swDest!);
     _generatedAssetNames.add(this.config.swDest);
 
     if (this.config.compileSrc) {
-      await this.performChildCompilation(compilation, parentCompiler);
+      await performChildCompilation(
+        compiler,
+        compilation,
+        this.constructor.name,
+        this.config.swSrc,
+        this.config.swDest,
+        this.config.webpackCompilationPlugins,
+      );
     } else {
-      this.addSrcToAssets(compilation, parentCompiler);
+      this.addSrcToAssets(compiler, compilation);
       // 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) {
@@ -234,10 +200,10 @@ export class InjectManifest {
     const { size, sortedEntries, manifestString } = await this.getManifestEntries(compilation, config);
 
     // See https://webpack.js.org/contribute/plugin-patterns/#monitoring-the-watch-graph
-    const absoluteSwSrc = upath.resolve(config.swSrc);
-    compilation.fileDependencies.add(absoluteSwSrc);
+    compilation.fileDependencies.add(path.resolve(config.swSrc));
 
     const swAsset = compilation.getAsset(config.swDest!);
+
     const swAssetString = swAsset!.source.source().toString();
 
     const globalRegexp = new RegExp(escapeRegExp(config.injectionPoint), "g");
@@ -258,20 +224,18 @@ export class InjectManifest {
       _generatedAssetNames.add(sourcemapAssetName);
       const sourcemapAsset = compilation.getAsset(sourcemapAssetName);
       const { source, map } = await replaceAndUpdateSourceMap({
-        jsFilename: config.swDest!,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        jsFilename: toUnix(config.swDest!),
         originalMap: JSON.parse(sourcemapAsset!.source.source().toString()),
         originalSource: swAssetString,
         replaceString: manifestString,
-        searchString: config.injectionPoint!,
+        searchString: config.injectionPoint,
       });
-
       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 this.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,6 +1,7 @@
-import type { Compilation, Compiler, WebpackError, WebpackPluginInstance, default as Webpack } from "webpack";
+import type { Compiler, WebpackError, WebpackPluginInstance } from "webpack";
 
 import { relativeToOutputPath } from "./relative-to-output-path.js";
+import { performChildCompilation } from "./perform-child-compilation.js";
 
 export interface ChildCompilationPluginOptions {
   src: string;
@@ -17,20 +18,10 @@ 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!;
-  }
-  /**
-   * @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
@@ -38,51 +29,17 @@ export class ChildCompilationPlugin implements WebpackPluginInstance {
    * @private
    */
   apply(compiler: Compiler) {
-    this.propagateWebpackConfig(compiler);
-
     compiler.hooks.make.tapPromise(this.constructor.name, (compilation) =>
-      this.performChildCompilation(compilation, compiler).catch((error: WebpackError) => {
+      performChildCompilation(
+        compiler,
+        compilation,
+        this.constructor.name,
+        this.src,
+        relativeToOutputPath(compilation, this.dest),
+        this.plugins,
+      ).catch((error: WebpackError) => {
         compilation.errors.push(error);
       }),
     );
   }
-  /**
-   * @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,
-    };
-
-    const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
-    childCompiler.options.target = "webworker";
-    childCompiler.context = parentCompiler.context;
-    childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-    childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-
-    if (this.plugins !== undefined) {
-      for (const plugin of this.plugins) {
-        plugin?.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) => {
-        if (error) {
-          reject(error);
-        } else {
-          compilation.warnings = compilation.warnings.concat(childCompilation?.warnings ?? []);
-          compilation.errors = compilation.errors.concat(childCompilation?.errors ?? []);
-
-          resolve();
-        }
-      });
-    });
-  }
 }

package/src/lib/get-script-files-for-chunks.ts

@@ -5,8 +5,7 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-
-import upath from "upath";
+import path from "node:path";
 import type { Compilation, WebpackError } from "webpack";
 
 import { resolveWebpackURL } from "./resolve-webpack-url.js";
@@ -21,7 +20,7 @@ export const getScriptFilesForChunks = (compilation: Compilation, chunkNames: st
     if (chunk) {
       for (const file of chunk?.files ?? []) {
         // See https://github.com/GoogleChrome/workbox/issues/2161
-        if (upath.extname(file) === ".js") {
+        if (path.extname(file) === ".js") {
           scriptFiles.add(resolveWebpackURL(publicPath as string, file));
         }
       }

package/src/lib/get-sourcemap-asset-name.ts

@@ -5,9 +5,8 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-
+import path from "node:path";
 import { getSourceMapURL } from "@serwist/build";
-import upath from "upath";
 import type { Compilation } from "webpack";
 
 /**
@@ -35,9 +34,8 @@ export const getSourcemapAssetName = (compilation: Compilation, swContents: stri
     // This *might* not be a valid asset if the sourcemap URL that was found
     // was added by another module incidentally.
     // See https://github.com/GoogleChrome/workbox/issues/2250
-    const swAssetDirname = upath.dirname(swDest);
-    const sourcemapURLAssetName = upath.normalize(upath.join(swAssetDirname, url));
-
+    const swAssetDirname = path.dirname(swDest);
+    const sourcemapURLAssetName = path.normalize(path.join(swAssetDirname, url));
     // Not sure if there's a better way to check for asset existence?
     if (compilation.getAsset(sourcemapURLAssetName)) {
       return sourcemapURLAssetName;

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

@@ -0,0 +1,45 @@
+import type { Compilation, Compiler } from "webpack";
+import type { WebpackPlugin } from "./types.js";
+
+/**
+ * Perform a child compilation.
+ * 
+ * @param compiler The parent webpack compiler.
+ * @param compilation The webpack compilation.
+ * @param name The name of the child compiler.
+ * @param src The source file. Should be absolute.
+ * @param dest The destination file. Should be relative to the compilation.
+ * @param plugins Additional webpack plugins.
+ * 
+ * @private
+ */
+export const performChildCompilation = async (
+  compiler: Compiler,
+  compilation: Compilation,
+  name: string,
+  src: string,
+  dest: string,
+  plugins: WebpackPlugin[] | undefined,
+) => {
+  const childCompiler = compilation.createChildCompiler(name, { filename: dest }, plugins);
+
+  new compiler.webpack.webworker.WebWorkerTemplatePlugin().apply(childCompiler);
+
+  new compiler.webpack.EntryPlugin(compiler.context, src, name).apply(childCompiler);
+
+  await new Promise<void>((resolve, reject) => {
+    childCompiler.runAsChild((error, _entries, childCompilation) => {
+      if (error) {
+        reject(error);
+      } else {
+        if (childCompilation?.warnings) {
+          compilation.warnings.push(...childCompilation.warnings);
+        }
+        if (childCompilation?.errors) {
+          compilation.errors.push(...childCompilation.errors);
+        }
+        resolve();
+      }
+    });
+  });
+};

package/src/lib/relative-to-output-path.ts

@@ -5,25 +5,24 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-
-import upath from "upath";
+import path from "node:path";
 import type { Compilation } from "webpack";
 
 /**
  * @param compilation The webpack compilation.
- * @param path The original path value.
+ * @param originalPath The original path value.
  *
  * @returns If path was not absolute, the returns path as-is.
  * Otherwise, returns path relative to the compilation's output path.
  *
  * @private
  */
-export const relativeToOutputPath = (compilation: Compilation, path: string): string => {
+export const relativeToOutputPath = (compilation: Compilation, originalPath: string): string => {
   // See https://github.com/jantimon/html-webpack-plugin/pull/266/files#diff-168726dbe96b3ce427e7fedce31bb0bcR38
-  if (upath.resolve(path) === upath.normalize(path)) {
-    return upath.relative(compilation.options.output.path!, path);
+  if (path.resolve(originalPath) === path.normalize(originalPath)) {
+    return path.relative(compilation.options.output.path!, originalPath);
   }
 
   // Otherwise, return swDest as-is.
-  return path;
+  return originalPath;
 };

package/src/lib/types.ts

@@ -7,6 +7,7 @@ import type {
   OptionalSwDestResolved,
 } from "@serwist/build";
 import type { Require } from "@serwist/utils";
+import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
 
 export interface WebpackPartial {
   /**
@@ -57,7 +58,7 @@ export interface InjectPartial {
    * Optional webpack plugins that will be used when compiling the `swSrc`
    * file. Only valid if `compileSrc` is `true`.
    */
-  webpackCompilationPlugins?: any[];
+  webpackCompilationPlugins?: WebpackPlugin[];
 }
 
 export type InjectResolved = Require<InjectPartial, "compileSrc">;
@@ -65,3 +66,5 @@ export type InjectResolved = Require<InjectPartial, "compileSrc">;
 export interface InjectManifestOptions extends BasePartial, WebpackPartial, BaseInjectPartial, OptionalSwDestPartial, InjectPartial {}
 
 export interface InjectManifestOptionsComplete extends BaseResolved, WebpackResolved, BaseInjectResolved, OptionalSwDestResolved, InjectResolved {}
+
+export type WebpackPlugin = WebpackPluginFunction | WebpackPluginInstance;

package/dist/chunks/relative-to-output-path.js

@@ -1,10 +0,0 @@
-import upath from 'upath';
-
-const relativeToOutputPath = (compilation, path)=>{
-    if (upath.resolve(path) === upath.normalize(path)) {
-        return upath.relative(compilation.options.output.path, path);
-    }
-    return path;
-};
-
-export { relativeToOutputPath as r };