@serwist/webpack-plugin 10.0.0-preview.7 → 10.0.0-preview.9

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

@@ -1,5 +1,5 @@
-import { toUnix } from '@serwist/utils';
 import path from 'node:path';
+import { toUnix } from '@serwist/utils';
 
 const performChildCompilation = async (compiler, compilation, name, src, dest, plugins)=>{
     const childCompiler = compilation.createChildCompiler(name, {

package/dist/chunks/schema.js

@@ -1,32 +1,37 @@
-import { basePartial, injectPartial as injectPartial$1, optionalSwDestPartial } from '@serwist/build/schema';
+import { fn, optionalSwDestPartial, injectPartial as injectPartial$1, basePartial } 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({
     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
+});
 
 export { injectManifestOptions, injectPartial, webpackPartial };

package/dist/index.internal.js

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

package/dist/index.js

@@ -24,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;
         }
     }
@@ -150,7 +152,7 @@ const getSourcemapAssetName = (compilation, swContents, swDest)=>{
 
 const validateInjectManifestOptions = async (input)=>{
     const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
-        errorMap: validationErrorMap
+        error: validationErrorMap
     });
     if (!result.success) {
         throw new SerwistConfigError({

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;AAEpD,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIvE,OAAO,KAAK,EAAyB,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAoKvF,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"}
+{"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/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,GAAI,aAAa,WAAW,EAAE,cAAc,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/schema.d.ts

@@ -1,229 +1,86 @@
 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.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
+    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    include: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
+}, z.core.$strict>;
 export declare const injectPartial: z.ZodObject<{
     compileSrc: z.ZodDefault<z.ZodBoolean>;
     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;
-}>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+}, z.core.$strict>;
 export declare const injectManifestOptions: z.ZodObject<{
-    additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    compileSrc: z.ZodDefault<z.ZodBoolean>;
+    swDest: z.ZodOptional<z.ZodString>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    injectionPoint: z.ZodDefault<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.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
+    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    include: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
+    additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [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>]>>>;
     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<{
+    dontCacheBustURLsMatching: z.ZodOptional<z.ZodCustom<RegExp, RegExp>>;
+    manifestTransforms: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodArray<z.ZodObject<{
+        size: z.ZodNumber;
         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<{
+    }, z.core.$strip>>, z.ZodOptional<z.ZodUnknown>], null>, z.ZodObject<{
         manifest: z.ZodArray<z.ZodObject<{
+            size: z.ZodNumber;
             integrity: z.ZodOptional<z.ZodString>;
             revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             url: z.ZodString;
-        } & {
+        }, z.core.$strip>>;
+        warnings: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strict>>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodArray<z.ZodObject<{
+        size: z.ZodNumber;
+        integrity: z.ZodOptional<z.ZodString>;
+        revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        url: z.ZodString;
+    }, z.core.$strip>>, z.ZodOptional<z.ZodUnknown>], null>, z.ZodObject<{
+        manifest: z.ZodArray<z.ZodObject<{
             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<{
+            integrity: z.ZodOptional<z.ZodString>;
+            revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            url: z.ZodString;
+        }, z.core.$strip>>;
+        warnings: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strict>>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodArray<z.ZodObject<{
+        size: z.ZodNumber;
+        integrity: z.ZodOptional<z.ZodString>;
+        revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        url: z.ZodString;
+    }, z.core.$strip>>, z.ZodOptional<z.ZodUnknown>], null>, z.ZodObject<{
         manifest: z.ZodArray<z.ZodObject<{
+            size: z.ZodNumber;
             integrity: z.ZodOptional<z.ZodString>;
             revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             url: z.ZodString;
-        } & {
+        }, z.core.$strip>>;
+        warnings: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strict>>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodArray<z.ZodObject<{
+        size: z.ZodNumber;
+        integrity: z.ZodOptional<z.ZodString>;
+        revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        url: z.ZodString;
+    }, z.core.$strip>>, z.ZodOptional<z.ZodUnknown>], null>, z.ZodObject<{
+        manifest: z.ZodArray<z.ZodObject<{
             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">>;
+            integrity: z.ZodOptional<z.ZodString>;
+            revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            url: z.ZodString;
+        }, z.core.$strip>>;
+        warnings: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strict>>>>>>;
     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;
-} & {
-    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":"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;;;;;;;;;;;;;iBAiB5D,CAAC;gBAAsC,CAAC;;;;iBACoB,CAAC;gBAAsC,CAAC;;;;;;;;;;;qBAAgd,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;qBAAqY,CAAC;oBAA0C,CAAC;;;;qBAAkH,CAAC;oBAA0C,CAAC;;;;;;;qBAAiP,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;qBAA6H,CAAC;oBAA0C,CAAC;;gBAA0D,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA3U,CAAC;oBAA0C,CAAC;;;;;;;qBAAvrC,CAAC;oBAA0C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAAm0C,CAAC;oBAA0C,CAAC;;;;;;;qBAAvrC,CAAC;oBAA0C,CAAC;;;;;;EAD7sC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,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,6 @@
 import type { InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, BasePartial, BaseResolved, OptionalSwDestPartial, OptionalSwDestResolved } from "@serwist/build";
 import type { Prettify, Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance, Asset, Compilation } from "webpack";
+import type { Asset, Compilation, WebpackPluginFunction, WebpackPluginInstance } from "webpack";
 export interface ConditionCallbackOptions {
     asset: Asset;
     compilation: Compilation;

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,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,WAAW,EACX,YAAY,EACZ,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,KAAK,EAAE,WAAW,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,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,EACrB,sBAAsB,EACvB,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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "10.0.0-preview.7",
+  "version": "10.0.0-preview.9",
   "type": "module",
   "sideEffects": false,
   "description": "A plugin for your webpack build process, helping you generate a manifest of local files that should be precached.",
@@ -59,18 +59,18 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "pretty-bytes": "6.1.1",
-    "zod": "3.24.3",
-    "@serwist/build": "10.0.0-preview.7",
-    "@serwist/utils": "10.0.0-preview.7"
+    "pretty-bytes": "7.0.0",
+    "zod": "4.0.5",
+    "@serwist/build": "10.0.0-preview.9",
+    "@serwist/utils": "10.0.0-preview.9"
   },
   "devDependencies": {
-    "@types/node": "22.14.1",
+    "@types/node": "24.0.14",
     "@types/webpack": "5.28.5",
-    "rollup": "4.40.0",
+    "rollup": "4.45.1",
     "typescript": "5.8.3",
-    "webpack": "5.99.6",
-    "@serwist/configs": "10.0.0-preview.7"
+    "webpack": "5.100.2",
+    "@serwist/configs": "10.0.0-preview.9"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

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

@@ -5,9 +5,10 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-import type { FileDetails } from "@serwist/utils";
+
 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,8 +5,9 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-import { toUnix } from "@serwist/utils";
+
 import path from "node:path";
+import { toUnix } from "@serwist/utils";
 import type { Compilation } from "webpack";
 
 /**

package/src/lib/schema.ts

@@ -1,28 +1,30 @@
-import { injectPartial as baseInjectPartial, basePartial, optionalSwDestPartial } from "@serwist/build/schema";
+import { injectPartial as baseInjectPartial, basePartial, fn, optionalSwDestPartial } from "@serwist/build/schema";
 import { z } from "zod";
 
-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({
+  compileSrc: z.boolean().default(true),
+  swDest: z.string().optional(),
+  webpackCompilationPlugins: z.array(z.any()).optional(),
+});
+
+export const injectManifestOptions = z.strictObject({
+  ...basePartial.shape,
+  ...webpackPartial.shape,
+  ...baseInjectPartial.shape,
+  ...optionalSwDestPartial.shape,
+  ...injectPartial.shape,
+});

package/src/lib/types.ts

@@ -7,7 +7,7 @@ import type {
   OptionalSwDestResolved,
 } from "@serwist/build";
 import type { Prettify, Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance, Asset, Compilation } from "webpack";
+import type { Asset, Compilation, WebpackPluginFunction, WebpackPluginInstance } from "webpack";
 
 export interface ConditionCallbackOptions {
   asset: Asset;

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) });
   }