@serwist/webpack-plugin 10.0.0-preview.1 → 10.0.0-preview.11

package/dist/chunks/{perform-child-compilation.js → relative-to-output-path.js}

@@ -1,11 +1,5 @@
 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;
-};
+import { toUnix } from '@serwist/utils';
 
 const performChildCompilation = async (compiler, compilation, name, src, dest, plugins)=>{
     const childCompiler = compilation.createChildCompiler(name, {
@@ -30,4 +24,11 @@ const performChildCompilation = async (compiler, compilation, name, src, dest, p
     });
 };
 
+const relativeToOutputPath = (compilation, originalPath)=>{
+    if (path.resolve(originalPath) === path.normalize(originalPath)) {
+        return toUnix(path.relative(compilation.options.output.path, originalPath));
+    }
+    return originalPath;
+};
+
 export { performChildCompilation as p, relativeToOutputPath as r };

package/dist/chunks/schema.js

@@ -1,32 +1,43 @@
-import { basePartial, injectPartial as injectPartial$1, optionalSwDestPartial } from '@serwist/build/schema';
+import { fn, optionalSwDestPartial, injectPartial as injectPartial$1, basePartial, assertType } from '@serwist/build/schema';
 import { z } from 'zod';
 
-const webpackPartial = z.object({
+const webpackConditionCallback = fn({
+    input: [
+        z.any()
+    ],
+    output: z.boolean()
+});
+const webpackCondition = z.union([
+    z.string(),
+    z.instanceof(RegExp),
+    webpackConditionCallback
+]);
+const webpackPartial = z.strictObject({
     chunks: z.array(z.string()).optional(),
-    exclude: z.array(z.union([
-        z.string(),
-        z.instanceof(RegExp),
-        z.function(z.tuple([
-            z.any()
-        ]), z.boolean())
-    ])).default([
+    exclude: z.array(webpackCondition).default([
         /\.map$/,
         /^manifest.*\.js$/
     ]),
     excludeChunks: z.array(z.string()).optional(),
-    include: z.array(z.union([
-        z.string(),
-        z.instanceof(RegExp),
-        z.function(z.tuple([
-            z.any()
-        ]), z.boolean())
-    ])).optional()
-}).strict("Do not pass invalid properties to WebpackPartial!");
-const injectPartial = z.object({
+    include: z.array(webpackCondition).optional()
+});
+const injectPartial = z.strictObject({
+    ...optionalSwDestPartial.shape,
     compileSrc: z.boolean().default(true),
-    swDest: z.string().optional(),
     webpackCompilationPlugins: z.array(z.any()).optional()
-}).strict("Do not pass invalid properties to WebpackInjectManifestPartial!");
-const injectManifestOptions = basePartial.merge(webpackPartial).merge(injectPartial$1).merge(optionalSwDestPartial).merge(injectPartial).strict("Do not pass invalid properties to WebpackInjectManifestOptions!");
+});
+const injectManifestOptions = z.strictObject({
+    ...basePartial.shape,
+    ...webpackPartial.shape,
+    ...injectPartial$1.shape,
+    ...optionalSwDestPartial.shape,
+    ...injectPartial.shape
+});
+assertType();
+assertType();
+assertType();
+assertType();
+assertType();
+assertType();
 
 export { injectManifestOptions, injectPartial, webpackPartial };

package/dist/index.internal.js

@@ -1,5 +1,6 @@
-import { p as performChildCompilation, r as relativeToOutputPath } from './chunks/perform-child-compilation.js';
+import { p as performChildCompilation, r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
 import 'node:path';
+import '@serwist/utils';
 
 class ChildCompilationPlugin {
     src;

package/dist/index.js

@@ -2,28 +2,15 @@ import path from 'node:path';
 import { transformManifest, getSourceMapURL, escapeRegExp, replaceAndUpdateSourceMap } from '@serwist/build';
 import { toUnix } from '@serwist/utils';
 import prettyBytes from 'pretty-bytes';
-import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 import crypto from 'node:crypto';
-import { r as relativeToOutputPath, p as performChildCompilation } from './chunks/perform-child-compilation.js';
-
-const validateInjectManifestOptions = async (input)=>{
-    const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
-        errorMap: validationErrorMap
-    });
-    if (!result.success) {
-        throw new SerwistConfigError({
-            moduleName: "@serwist/webpack-plugin",
-            message: JSON.stringify(result.error.format(), null, 2)
-        });
-    }
-    return result.data;
-};
+import { r as relativeToOutputPath, p as performChildCompilation } from './chunks/relative-to-output-path.js';
+import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 
 const getAssetHash = (asset)=>{
     if (asset.info?.immutable) {
         return null;
     }
-    return crypto.createHash("md5").update(Buffer.from(asset.source.source())).digest("hex");
+    return crypto.createHash("md5").update(asset.source.source()).digest("hex");
 };
 
 const resolveWebpackURL = (publicPath, ...paths)=>{
@@ -37,14 +24,16 @@ const resolveWebpackURL = (publicPath, ...paths)=>{
 };
 
 const checkConditions = (asset, compilation, conditions = [])=>{
+    const matchPart = compilation.compiler.webpack.ModuleFilenameHelpers.matchPart;
     for (const condition of conditions){
         if (typeof condition === "function") {
-            return condition({
+            if (condition({
                 asset,
                 compilation
-            });
-        }
-        if (compilation.compiler.webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
+            })) {
+                return true;
+            }
+        } else if (matchPart(asset.name, condition)) {
             return true;
         }
     }
@@ -161,6 +150,19 @@ const getSourcemapAssetName = (compilation, swContents, swDest)=>{
     return undefined;
 };
 
+const validateInjectManifestOptions = async (input)=>{
+    const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
+        error: validationErrorMap
+    });
+    if (!result.success) {
+        throw new SerwistConfigError({
+            moduleName: "@serwist/webpack-plugin",
+            message: JSON.stringify(result.error.format(), null, 2)
+        });
+    }
+    return result.data;
+};
+
 const _generatedAssetNames = new Set();
 class InjectManifest {
     config;

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AAKvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAO3F;;;;;;;;;;;;;;;;;;;;;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/get-asset-hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-asset-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-asset-hash.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,KAAK,KAAG,MAAM,GAAG,IASpD,CAAC"}
+{"version":3,"file":"get-asset-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-asset-hash.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,KAAG,MAAM,GAAG,IASpD,CAAC"}

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,MAAM,gBAAgB,CAAC;AAEjE,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIvE,OAAO,KAAK,EAAyB,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAoKvF,eAAO,MAAM,iCAAiC,gBAC/B,WAAW,UAChB,6BAA6B,KACpC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;CAAE,CAiCtE,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,MAAM,gBAAgB,CAAC;AAGpD,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIvE,OAAO,KAAK,EAAyB,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAiKvF,eAAO,MAAM,iCAAiC,GAC5C,aAAa,WAAW,EACxB,QAAQ,6BAA6B,KACpC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;CAAE,CAiCtE,CAAC"}

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":"AAQA,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,GAAI,aAAa,WAAW,EAAE,YAAY,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":"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"}
+{"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,GAAI,aAAa,WAAW,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,KAAG,MAAM,GAAG,SAgB7G,CAAC"}

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

@@ -1 +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"}
+{"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,GAClC,UAAU,QAAQ,EAClB,aAAa,WAAW,EACxB,MAAM,MAAM,EACZ,KAAK,MAAM,EACX,MAAM,MAAM,EACZ,SAAS,aAAa,EAAE,GAAG,SAAS,kBAuBrC,CAAC"}

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":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,gBAAgB,MAAM,KAAG,MAQrF,CAAC"}
+{"version":3,"file":"relative-to-output-path.d.ts","sourceRoot":"","sources":["../../src/lib/relative-to-output-path.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAAI,aAAa,WAAW,EAAE,cAAc,MAAM,KAAG,MAQrF,CAAC"}

package/dist/lib/resolve-webpack-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-webpack-url.d.ts","sourceRoot":"","sources":["../../src/lib/resolve-webpack-url.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,eAAgB,MAAM,YAAY,MAAM,EAAE,KAAG,MAO1E,CAAC"}
+{"version":3,"file":"resolve-webpack-url.d.ts","sourceRoot":"","sources":["../../src/lib/resolve-webpack-url.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,EAAE,GAAG,OAAO,MAAM,EAAE,KAAG,MAO1E,CAAC"}

package/dist/lib/schema.d.ts

@@ -1,233 +1,30 @@
 import { z } from "zod";
 export declare const webpackPartial: z.ZodObject<{
-    chunks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    exclude: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<RegExp, z.ZodTypeDef, RegExp>, z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>]>, "many">>;
-    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    include: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<RegExp, z.ZodTypeDef, RegExp>, z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>]>, "many">>;
-}, "strict", z.ZodTypeAny, {
-    exclude: (string | RegExp | ((args_0: any) => boolean))[];
-    chunks?: string[] | undefined;
-    excludeChunks?: string[] | undefined;
-    include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-}, {
-    exclude?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    chunks?: string[] | undefined;
-    excludeChunks?: string[] | undefined;
-    include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-}>;
+    chunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    exclude: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodType<(args_0: any) => boolean, (args_0: any) => boolean, z.core.$ZodTypeInternals<(args_0: any) => boolean, (args_0: any) => boolean>>]>>>;
+    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    include: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodType<(args_0: any) => boolean, (args_0: any) => boolean, z.core.$ZodTypeInternals<(args_0: any) => boolean, (args_0: any) => boolean>>]>>>;
+}, z.core.$strict>;
 export declare const injectPartial: z.ZodObject<{
     compileSrc: z.ZodDefault<z.ZodBoolean>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
     swDest: z.ZodOptional<z.ZodString>;
-    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny, "many">>;
-}, "strict", z.ZodTypeAny, {
-    compileSrc: boolean;
-    webpackCompilationPlugins?: any[] | undefined;
-    swDest?: string | undefined;
-}, {
-    compileSrc?: boolean | 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<{
-        integrity: z.ZodOptional<z.ZodString>;
-        revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        url: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        url: string;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }, {
-        url: string;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }>]>, "many">>;
+}, z.core.$strict>;
+export declare const injectManifestOptions: z.ZodObject<{
+    compileSrc: z.ZodDefault<z.ZodBoolean>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    swDest: z.ZodOptional<z.ZodString>;
+    injectionPoint: z.ZodPrefault<z.ZodString>;
+    swSrc: z.ZodString;
+    chunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    exclude: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodType<(args_0: any) => boolean, (args_0: any) => boolean, z.core.$ZodTypeInternals<(args_0: any) => boolean, (args_0: any) => boolean>>]>>>;
+    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    include: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodType<(args_0: any) => boolean, (args_0: any) => boolean, z.core.$ZodTypeInternals<(args_0: any) => boolean, (args_0: any) => boolean>>]>>>;
+    additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodType<import("@serwist/build").ManifestEntry, import("@serwist/build").ManifestEntry, z.core.$ZodTypeInternals<import("@serwist/build").ManifestEntry, import("@serwist/build").ManifestEntry>>]>>>;
     disablePrecacheManifest: z.ZodDefault<z.ZodBoolean>;
-    dontCacheBustURLsMatching: z.ZodOptional<z.ZodType<RegExp, z.ZodTypeDef, RegExp>>;
-    manifestTransforms: z.ZodOptional<z.ZodArray<z.ZodFunction<z.ZodTuple<[z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
-        integrity: z.ZodOptional<z.ZodString>;
-        revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        url: z.ZodString;
-    }, {
-        size: z.ZodNumber;
-    }>, "strip", z.ZodTypeAny, {
-        url: string;
-        size: number;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }, {
-        url: string;
-        size: number;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }>, "many">, z.ZodOptional<z.ZodUnknown>], null>, z.ZodUnion<[z.ZodPromise<z.ZodObject<{
-        manifest: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
-            integrity: z.ZodOptional<z.ZodString>;
-            revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-            url: z.ZodString;
-        }, {
-            size: z.ZodNumber;
-        }>, "strip", z.ZodTypeAny, {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }, {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }>, "many">;
-        warnings: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, "strict", z.ZodTypeAny, {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }, {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }>>, z.ZodObject<{
-        manifest: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
-            integrity: z.ZodOptional<z.ZodString>;
-            revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-            url: z.ZodString;
-        }, {
-            size: z.ZodNumber;
-        }>, "strip", z.ZodTypeAny, {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }, {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }>, "many">;
-        warnings: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, "strict", z.ZodTypeAny, {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }, {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }>]>>, "many">>;
+    dontCacheBustURLsMatching: z.ZodOptional<z.ZodCustom<RegExp, RegExp>>;
+    manifestTransforms: z.ZodOptional<z.ZodArray<z.ZodType<import("@serwist/build").ManifestTransform, import("@serwist/build").ManifestTransform, z.core.$ZodTypeInternals<import("@serwist/build").ManifestTransform, import("@serwist/build").ManifestTransform>>>>;
     maximumFileSizeToCacheInBytes: z.ZodDefault<z.ZodNumber>;
     modifyURLPrefix: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-}, {
-    chunks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    exclude: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<RegExp, z.ZodTypeDef, RegExp>, z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>]>, "many">>;
-    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    include: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<RegExp, z.ZodTypeDef, RegExp>, z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>]>, "many">>;
-}>, {
-    injectionPoint: z.ZodDefault<z.ZodString>;
-    swSrc: z.ZodString;
-}>, {
-    swDest: z.ZodOptional<z.ZodString>;
-}>, {
-    compileSrc: z.ZodDefault<z.ZodBoolean>;
-    swDest: z.ZodOptional<z.ZodString>;
-    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny, "many">>;
-}>, "strict", z.ZodTypeAny, {
-    exclude: (string | RegExp | ((args_0: any) => boolean))[];
-    compileSrc: boolean;
-    disablePrecacheManifest: boolean;
-    maximumFileSizeToCacheInBytes: number;
-    injectionPoint: string;
-    swSrc: string;
-    chunks?: string[] | undefined;
-    excludeChunks?: string[] | undefined;
-    include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    webpackCompilationPlugins?: any[] | undefined;
-    additionalPrecacheEntries?: (string | {
-        url: string;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    })[] | undefined;
-    dontCacheBustURLsMatching?: RegExp | undefined;
-    manifestTransforms?: ((args_0: {
-        url: string;
-        size: number;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }[], args_1: unknown) => {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    } | Promise<{
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }>)[] | undefined;
-    modifyURLPrefix?: Record<string, string> | undefined;
-    swDest?: string | undefined;
-}, {
-    swSrc: string;
-    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;
-    webpackCompilationPlugins?: any[] | undefined;
-    disablePrecacheManifest?: boolean | undefined;
-    maximumFileSizeToCacheInBytes?: number | undefined;
-    injectionPoint?: string | undefined;
-    additionalPrecacheEntries?: (string | {
-        url: string;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    })[] | undefined;
-    dontCacheBustURLsMatching?: RegExp | undefined;
-    manifestTransforms?: ((args_0: {
-        url: string;
-        size: number;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    }[], args_1: unknown) => {
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    } | Promise<{
-        manifest: {
-            url: string;
-            size: number;
-            integrity?: string | undefined;
-            revision?: string | null | undefined;
-        }[];
-        warnings?: string[] | undefined;
-    }>)[] | undefined;
-    modifyURLPrefix?: Record<string, string> | undefined;
-    swDest?: string | undefined;
-}>;
+}, z.core.$strict>;
 //# 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":"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"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAiBxB,eAAO,MAAM,cAAc;;;;;kBAKzB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;kBAIxB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;kBAMhC,CAAC"}

package/dist/lib/types.d.ts

@@ -1,6 +1,11 @@
-import type { BasePartial, BaseResolved, InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, OptionalSwDestPartial, OptionalSwDestResolved } from "@serwist/build";
+import type { InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, BasePartial, BaseResolved, OptionalSwDestPartial } from "@serwist/build";
 import type { Prettify, Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+import type { Asset, Compilation, WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+export interface ConditionCallbackOptions {
+    asset: Asset;
+    compilation: Compilation;
+}
+export type ConditionCallback = (options: ConditionCallbackOptions) => boolean;
 export interface WebpackPartial {
     /**
      * One or more chunk names whose corresponding output files should be included
@@ -17,7 +22,7 @@ export interface WebpackPartial {
      * [/\.map$/, /^manifest.*\.js$/]
      * ```
      */
-    exclude?: (string | RegExp | ((arg0: any) => boolean))[];
+    exclude?: (string | RegExp | ConditionCallback)[];
     /**
      * One or more chunk names whose corresponding output files should be excluded
      * from the precache manifest.
@@ -29,10 +34,10 @@ export interface WebpackPartial {
      * [the same rules](https://webpack.js.org/configuration/module/#condition)
      * as webpack's standard `include` option.
      */
-    include?: (string | RegExp | ((arg0: any) => boolean))[];
+    include?: (string | RegExp | ConditionCallback)[];
 }
 export type WebpackResolved = Prettify<Require<WebpackPartial, "exclude">>;
-export interface InjectPartial {
+export interface InjectPartial extends OptionalSwDestPartial {
     /**
      * When `true` (the default), the `swSrc` file will be compiled by webpack.
      * When `false`, compilation will not occur (and `webpackCompilationPlugins`
@@ -48,7 +53,7 @@ export interface InjectPartial {
     webpackCompilationPlugins?: WebpackPlugin[];
 }
 export type InjectResolved = Prettify<Require<InjectPartial, "compileSrc">>;
-export type InjectManifestOptions = Prettify<BasePartial & WebpackPartial & BaseInjectPartial & OptionalSwDestPartial & InjectPartial>;
-export type InjectManifestOptionsComplete = Prettify<BaseResolved & WebpackResolved & BaseInjectResolved & OptionalSwDestResolved & InjectResolved>;
+export type InjectManifestOptions = Prettify<BasePartial & WebpackPartial & BaseInjectPartial & InjectPartial>;
+export type InjectManifestOptionsComplete = Prettify<BaseResolved & WebpackResolved & BaseInjectResolved & 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,QAAQ,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACxD,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,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;AAE3E,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,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC,WAAW,GAAG,cAAc,GAAG,iBAAiB,GAAG,qBAAqB,GAAG,aAAa,CAAC,CAAC;AAEvI,MAAM,MAAM,6BAA6B,GAAG,QAAQ,CAAC,YAAY,GAAG,eAAe,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,cAAc,CAAC,CAAC;AAEpJ,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,WAAW,EACX,YAAY,EACZ,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAEhG,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC;AAE/E,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC;IAClD;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC;CACnD;AAED,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;AAE3E,MAAM,WAAW,aAAc,SAAQ,qBAAqB;IAC1D;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC,WAAW,GAAG,cAAc,GAAG,iBAAiB,GAAG,aAAa,CAAC,CAAC;AAE/G,MAAM,MAAM,6BAA6B,GAAG,QAAQ,CAAC,YAAY,GAAG,eAAe,GAAG,kBAAkB,GAAG,cAAc,CAAC,CAAC;AAE3H,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/lib/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,6BAA6B,UAAiB,OAAO,KAAG,OAAO,CAAC,6BAA6B,CAMzG,CAAC"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/lib/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,6BAA6B,GAAU,OAAO,OAAO,KAAG,OAAO,CAAC,6BAA6B,CAMzG,CAAC"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "10.0.0-preview.1",
+  "version": "10.0.0-preview.11",
   "type": "module",
+  "sideEffects": false,
   "description": "A plugin for your webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
     "src",
@@ -20,7 +21,7 @@
     "file manifest"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "author": "Google's Web DevRel Team",
   "contributors": [
@@ -58,18 +59,18 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "pretty-bytes": "6.1.1",
-    "zod": "3.24.2",
-    "@serwist/build": "10.0.0-preview.1",
-    "@serwist/utils": "10.0.0-preview.1"
+    "pretty-bytes": "7.0.0",
+    "zod": "4.0.5",
+    "@serwist/build": "10.0.0-preview.11",
+    "@serwist/utils": "10.0.0-preview.11"
   },
   "devDependencies": {
-    "@types/node": "22.13.5",
+    "@types/node": "24.0.14",
     "@types/webpack": "5.28.5",
-    "rollup": "4.34.8",
-    "typescript": "5.7.3",
-    "webpack": "5.98.0",
-    "@serwist/configs": "10.0.0-preview.1"
+    "rollup": "4.45.1",
+    "typescript": "5.8.3",
+    "webpack": "5.100.2",
+    "@serwist/configs": "10.0.0-preview.11"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",
@@ -87,6 +88,7 @@
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch",
     "lint": "biome lint ./src",
+    "qcheck": "biome check ./src",
     "typecheck": "tsc"
   }
 }

package/src/inject-manifest.ts

@@ -2,13 +2,13 @@ import path from "node:path";
 import { escapeRegExp, replaceAndUpdateSourceMap } from "@serwist/build";
 import { toUnix } from "@serwist/utils";
 import prettyBytes from "pretty-bytes";
-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 type { Compilation, Compiler, default as Webpack, WebpackError } from "webpack";
 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";
+import { relativeToOutputPath } from "./lib/relative-to-output-path.js";
+import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./lib/types.js";
+import { validateInjectManifestOptions } from "./lib/validator.js";
 
 // Used to keep track of swDest files written by *any* instance of this plugin.
 // See https://github.com/GoogleChrome/workbox/issues/2181

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

@@ -1,7 +1,7 @@
 import type { Compiler, WebpackError, WebpackPluginInstance } from "webpack";
 
-import { relativeToOutputPath } from "./relative-to-output-path.js";
 import { performChildCompilation } from "./perform-child-compilation.js";
+import { relativeToOutputPath } from "./relative-to-output-path.js";
 
 export interface ChildCompilationPluginOptions {
   src: string;

package/src/lib/get-asset-hash.ts

@@ -23,5 +23,5 @@ export const getAssetHash = (asset: Asset): string | null => {
     return null;
   }
 
-  return crypto.createHash("md5").update(Buffer.from(asset.source.source())).digest("hex");
+  return crypto.createHash("md5").update(asset.source.source()).digest("hex");
 };

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

@@ -6,8 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { FileDetails, ManifestEntry } from "@serwist/build";
+import type { ManifestEntry } from "@serwist/build";
 import { transformManifest } from "@serwist/build";
+import type { FileDetails } from "@serwist/utils";
 import type { Asset, Chunk, Compilation, WebpackError } from "webpack";
 
 import { getAssetHash } from "./get-asset-hash.js";
@@ -25,18 +26,15 @@ import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./typ
  * @returns Whether or not at least one condition matches.
  * @private
  */
-const checkConditions = (
-  asset: Asset,
-  compilation: Compilation,
+const checkConditions = (asset: Asset, compilation: Compilation, conditions: Array<string | RegExp | ((arg0: any) => boolean)> = []): boolean => {
+  const matchPart = compilation.compiler.webpack.ModuleFilenameHelpers.matchPart;
 
-  conditions: Array<string | RegExp | ((arg0: any) => boolean)> = [],
-): boolean => {
   for (const condition of conditions) {
     if (typeof condition === "function") {
-      return condition({ asset, compilation });
-      //return compilation !== null;
-    }
-    if (compilation.compiler.webpack.ModuleFilenameHelpers.matchPart(asset.name, condition)) {
+      if (condition({ asset, compilation })) {
+        return true;
+      }
+    } else if (matchPart(asset.name, condition)) {
       return true;
     }
   }

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

@@ -5,7 +5,9 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
+
 import path from "node:path";
+import { toUnix } from "@serwist/utils";
 import type { Compilation } from "webpack";
 
 /**
@@ -20,7 +22,7 @@ import type { Compilation } from "webpack";
 export const relativeToOutputPath = (compilation: Compilation, originalPath: string): string => {
   // See https://github.com/jantimon/html-webpack-plugin/pull/266/files#diff-168726dbe96b3ce427e7fedce31bb0bcR38
   if (path.resolve(originalPath) === path.normalize(originalPath)) {
-    return path.relative(compilation.options.output.path!, originalPath);
+    return toUnix(path.relative(compilation.options.output.path!, originalPath));
   }
 
   // Otherwise, return swDest as-is.

package/src/lib/schema.ts

@@ -1,28 +1,45 @@
-import { basePartial, injectPartial as baseInjectPartial, optionalSwDestPartial } from "@serwist/build/schema";
+import { assertType, injectPartial as baseInjectPartial, basePartial, type Equals, fn, optionalSwDestPartial } from "@serwist/build/schema";
 import { z } from "zod";
+import type {
+  InjectManifestOptions,
+  InjectManifestOptionsComplete,
+  InjectPartial,
+  InjectResolved,
+  WebpackPartial,
+  WebpackResolved,
+} from "./types.js";
 
-export const webpackPartial = z
-  .object({
-    chunks: z.array(z.string()).optional(),
-    exclude: z
-      .array(z.union([z.string(), z.instanceof(RegExp), z.function(z.tuple([z.any()]), z.boolean())]))
-      .default([/\.map$/, /^manifest.*\.js$/]),
-    excludeChunks: z.array(z.string()).optional(),
-    include: z.array(z.union([z.string(), z.instanceof(RegExp), z.function(z.tuple([z.any()]), z.boolean())])).optional(),
-  })
-  .strict("Do not pass invalid properties to WebpackPartial!");
+const webpackConditionCallback = fn({
+  input: [z.any()],
+  output: z.boolean(),
+});
 
-export const injectPartial = z
-  .object({
-    compileSrc: z.boolean().default(true),
-    swDest: z.string().optional(),
-    webpackCompilationPlugins: z.array(z.any()).optional(),
-  })
-  .strict("Do not pass invalid properties to WebpackInjectManifestPartial!");
+const webpackCondition = z.union([z.string(), z.instanceof(RegExp), webpackConditionCallback]);
 
-export const injectManifestOptions = basePartial
-  .merge(webpackPartial)
-  .merge(baseInjectPartial)
-  .merge(optionalSwDestPartial)
-  .merge(injectPartial)
-  .strict("Do not pass invalid properties to WebpackInjectManifestOptions!");
+export const webpackPartial = z.strictObject({
+  chunks: z.array(z.string()).optional(),
+  exclude: z.array(webpackCondition).default([/\.map$/, /^manifest.*\.js$/]),
+  excludeChunks: z.array(z.string()).optional(),
+  include: z.array(webpackCondition).optional(),
+});
+
+export const injectPartial = z.strictObject({
+  ...optionalSwDestPartial.shape,
+  compileSrc: z.boolean().default(true),
+  webpackCompilationPlugins: z.array(z.any()).optional(),
+});
+
+export const injectManifestOptions = z.strictObject({
+  ...basePartial.shape,
+  ...webpackPartial.shape,
+  ...baseInjectPartial.shape,
+  ...optionalSwDestPartial.shape,
+  ...injectPartial.shape,
+});
+
+assertType<Equals<WebpackPartial, z.input<typeof webpackPartial>>>();
+assertType<Equals<WebpackResolved, z.output<typeof webpackPartial>>>();
+assertType<Equals<InjectPartial, z.input<typeof injectPartial>>>();
+assertType<Equals<InjectResolved, z.output<typeof injectPartial>>>();
+assertType<Equals<InjectManifestOptions, z.input<typeof injectManifestOptions>>>();
+assertType<Equals<InjectManifestOptionsComplete, z.output<typeof injectManifestOptions>>>();

package/src/lib/types.ts

@@ -1,13 +1,19 @@
 import type {
-  BasePartial,
-  BaseResolved,
   InjectPartial as BaseInjectPartial,
   InjectResolved as BaseInjectResolved,
+  BasePartial,
+  BaseResolved,
   OptionalSwDestPartial,
-  OptionalSwDestResolved,
 } from "@serwist/build";
 import type { Prettify, Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+import type { Asset, Compilation, WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+
+export interface ConditionCallbackOptions {
+  asset: Asset;
+  compilation: Compilation;
+}
+
+export type ConditionCallback = (options: ConditionCallbackOptions) => boolean;
 
 export interface WebpackPartial {
   /**
@@ -25,7 +31,7 @@ export interface WebpackPartial {
    * [/\.map$/, /^manifest.*\.js$/]
    * ```
    */
-  exclude?: (string | RegExp | ((arg0: any) => boolean))[];
+  exclude?: (string | RegExp | ConditionCallback)[];
   /**
    * One or more chunk names whose corresponding output files should be excluded
    * from the precache manifest.
@@ -37,12 +43,12 @@ export interface WebpackPartial {
    * [the same rules](https://webpack.js.org/configuration/module/#condition)
    * as webpack's standard `include` option.
    */
-  include?: (string | RegExp | ((arg0: any) => boolean))[];
+  include?: (string | RegExp | ConditionCallback)[];
 }
 
 export type WebpackResolved = Prettify<Require<WebpackPartial, "exclude">>;
 
-export interface InjectPartial {
+export interface InjectPartial extends OptionalSwDestPartial {
   /**
    * When `true` (the default), the `swSrc` file will be compiled by webpack.
    * When `false`, compilation will not occur (and `webpackCompilationPlugins`
@@ -63,8 +69,8 @@ export interface InjectPartial {
 
 export type InjectResolved = Prettify<Require<InjectPartial, "compileSrc">>;
 
-export type InjectManifestOptions = Prettify<BasePartial & WebpackPartial & BaseInjectPartial & OptionalSwDestPartial & InjectPartial>;
+export type InjectManifestOptions = Prettify<BasePartial & WebpackPartial & BaseInjectPartial & InjectPartial>;
 
-export type InjectManifestOptionsComplete = Prettify<BaseResolved & WebpackResolved & BaseInjectResolved & OptionalSwDestResolved & InjectResolved>;
+export type InjectManifestOptionsComplete = Prettify<BaseResolved & WebpackResolved & BaseInjectResolved & InjectResolved>;
 
 export type WebpackPlugin = WebpackPluginFunction | WebpackPluginInstance;

package/src/lib/validator.ts

@@ -2,7 +2,7 @@ import { SerwistConfigError, validationErrorMap } from "@serwist/build/schema";
 import type { InjectManifestOptionsComplete } from "./types.js";
 
 export const validateInjectManifestOptions = async (input: unknown): Promise<InjectManifestOptionsComplete> => {
-  const result = await (await import("./schema.js")).injectManifestOptions.spa(input, { errorMap: validationErrorMap });
+  const result = await (await import("./schema.js")).injectManifestOptions.spa(input, { error: validationErrorMap });
   if (!result.success) {
     throw new SerwistConfigError({ moduleName: "@serwist/webpack-plugin", message: JSON.stringify(result.error.format(), null, 2) });
   }