@serwist/vite 9.0.15 → 9.1.0

package/dist/chunks/schema.js

@@ -1,25 +1,42 @@
-import { basePartial, globPartial, injectPartial, requiredSwDestPartial, requiredGlobDirectoryPartial } from '@serwist/build/schema';
+import { fn, asyncFn, requiredGlobDirectoryPartial, requiredSwDestPartial, injectPartial, globPartial, basePartial } from '@serwist/build/schema';
 import { z } from 'zod';
 
 const hooks = z.object({
-    beforeBuildServiceWorker: z.function(z.tuple([
-        z.any()
-    ]), z.union([
-        z.promise(z.void()),
-        z.void()
-    ])).optional(),
+    beforeBuildServiceWorker: z.union([
+        fn({
+            input: [
+                z.any()
+            ],
+            output: z.void()
+        }),
+        asyncFn({
+            input: [
+                z.any()
+            ],
+            output: z.void()
+        })
+    ]).optional(),
     closeBundleOrder: z.union([
         z.literal("pre"),
         z.literal("post"),
         z.null()
     ]).optional(),
-    configureOptions: z.function(z.tuple([
-        z.any(),
-        z.any()
-    ]), z.union([
-        z.promise(z.void()),
-        z.void()
-    ])).optional()
+    configureOptions: z.union([
+        fn({
+            input: [
+                z.any(),
+                z.any()
+            ],
+            output: z.void()
+        }),
+        asyncFn({
+            input: [
+                z.any(),
+                z.any()
+            ],
+            output: z.void()
+        })
+    ]).optional()
 });
 const devOptions = z.object({
     bundle: z.boolean().default(true),
@@ -49,8 +66,15 @@ const injectManifestPartial = z.object({
         z.literal("iife")
     ]).default("es"),
     rollupOptions: z.record(z.string(), z.any()).default({}),
-    devOptions: devOptions.default({})
+    devOptions: devOptions.prefault({})
+});
+const injectManifestOptions = z.strictObject({
+    ...basePartial.shape,
+    ...globPartial.shape,
+    ...injectPartial.shape,
+    ...requiredSwDestPartial.shape,
+    ...requiredGlobDirectoryPartial.shape,
+    ...injectManifestPartial.shape
 });
-const injectManifestOptions = basePartial.merge(globPartial).merge(injectPartial).merge(requiredSwDestPartial).merge(requiredGlobDirectoryPartial).merge(injectManifestPartial).strict("Do not pass invalid properties to InjectManifestOptions!");
 
 export { devOptions, hooks, injectManifestOptions, injectManifestPartial };

package/dist/index.js

@@ -4,10 +4,11 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import fs$1 from 'node:fs';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
+import { z } from 'zod';
 import { normalizePath } from 'vite';
 import process from 'node:process';
 
-var version = "9.0.15";
+var version = "9.1.0";
 var packageJson = {
     version: version};
 
@@ -51,7 +52,7 @@ const injectManifest = async (options)=>{
 const generateServiceWorker = async (ctx)=>{
     const { plugins, rollupOptions, rollupFormat } = ctx.options;
     const parsedSwDest = path.parse(ctx.options.injectManifest.swDest);
-    let injectManifestResult = undefined;
+    let injectManifestResult;
     if (ctx.options.injectManifest.injectionPoint) {
         await ctx.options.integration?.beforeBuildServiceWorker?.(ctx.options);
         injectManifestResult = await injectManifest(ctx.options.injectManifest);
@@ -234,12 +235,12 @@ const toFs = (str)=>{
 
 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({
             moduleName: "@serwist/vite",
-            message: JSON.stringify(result.error.format(), null, 2)
+            message: z.prettifyError(result.error)
         });
     }
     return result.data;

package/dist/lib/schema.d.ts

@@ -1,367 +1,122 @@
 import { z } from "zod";
 export declare const hooks: z.ZodObject<{
-    beforeBuildServiceWorker: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-    closeBundleOrder: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
-    configureOptions: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-}, "strip", z.ZodTypeAny, {
-    beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-    closeBundleOrder?: "pre" | "post" | null | undefined;
-    configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-}, {
-    beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-    closeBundleOrder?: "pre" | "post" | null | undefined;
-    configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-}>;
+    beforeBuildServiceWorker: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>]>>;
+    closeBundleOrder: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
+    configureOptions: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any, args_1: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>]>>;
+}, z.core.$strip>;
 export declare const devOptions: z.ZodObject<{
     bundle: z.ZodDefault<z.ZodBoolean>;
-    minify: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
-}, "strip", z.ZodTypeAny, {
-    bundle: boolean;
-    minify: boolean | "terser" | "esbuild";
-}, {
-    bundle?: boolean | undefined;
-    minify?: boolean | "terser" | "esbuild" | undefined;
-}>;
+    minify: z.ZodDefault<z.ZodUnion<readonly [z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
+}, z.core.$strip>;
 export declare const injectManifestPartial: z.ZodObject<{
-    mode: z.ZodUnion<[z.ZodLiteral<"development">, z.ZodLiteral<"production">]>;
-    type: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"classic">, z.ZodLiteral<"module">]>>;
+    mode: z.ZodUnion<readonly [z.ZodLiteral<"development">, z.ZodLiteral<"production">]>;
+    type: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"classic">, z.ZodLiteral<"module">]>>;
     scope: z.ZodString;
     base: z.ZodString;
     disable: z.ZodDefault<z.ZodBoolean>;
     integration: z.ZodDefault<z.ZodObject<{
-        beforeBuildServiceWorker: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-        closeBundleOrder: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
-        configureOptions: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-    }, "strip", z.ZodTypeAny, {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    }, {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    }>>;
+        beforeBuildServiceWorker: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>]>>;
+        closeBundleOrder: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
+        configureOptions: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any, args_1: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>]>>;
+    }, z.core.$strip>>;
     swUrl: z.ZodDefault<z.ZodString>;
-    plugins: z.ZodDefault<z.ZodArray<z.ZodAny, "many">>;
-    rollupFormat: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"es">, z.ZodLiteral<"iife">]>>;
+    plugins: z.ZodDefault<z.ZodArray<z.ZodAny>>;
+    rollupFormat: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"es">, z.ZodLiteral<"iife">]>>;
     rollupOptions: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
-    devOptions: z.ZodDefault<z.ZodObject<{
+    devOptions: z.ZodPrefault<z.ZodObject<{
         bundle: z.ZodDefault<z.ZodBoolean>;
-        minify: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
-    }, "strip", z.ZodTypeAny, {
-        bundle: boolean;
-        minify: boolean | "terser" | "esbuild";
-    }, {
-        bundle?: boolean | undefined;
-        minify?: boolean | "terser" | "esbuild" | undefined;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    type: "classic" | "module";
-    mode: "development" | "production";
-    scope: string;
-    base: string;
-    disable: boolean;
-    integration: {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    };
-    swUrl: string;
-    plugins: any[];
-    rollupFormat: "es" | "iife";
-    rollupOptions: Record<string, any>;
-    devOptions: {
-        bundle: boolean;
-        minify: boolean | "terser" | "esbuild";
-    };
-}, {
-    mode: "development" | "production";
-    scope: string;
-    base: string;
-    type?: "classic" | "module" | undefined;
-    disable?: boolean | undefined;
-    integration?: {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    } | undefined;
-    swUrl?: string | undefined;
-    plugins?: any[] | undefined;
-    rollupFormat?: "es" | "iife" | undefined;
-    rollupOptions?: Record<string, any> | undefined;
-    devOptions?: {
-        bundle?: boolean | undefined;
-        minify?: boolean | "terser" | "esbuild" | undefined;
-    } | undefined;
-}>;
+        minify: z.ZodDefault<z.ZodUnion<readonly [z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 export declare const injectManifestOptions: z.ZodObject<{
-    additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    mode: z.ZodUnion<readonly [z.ZodLiteral<"development">, z.ZodLiteral<"production">]>;
+    type: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"classic">, z.ZodLiteral<"module">]>>;
+    scope: z.ZodString;
+    base: z.ZodString;
+    disable: z.ZodDefault<z.ZodBoolean>;
+    integration: z.ZodDefault<z.ZodObject<{
+        beforeBuildServiceWorker: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny], null>, z.ZodVoid>>>]>>;
+        closeBundleOrder: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
+        configureOptions: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<(args_0: any, args_1: any) => void, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>, z.ZodTransform<z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>, z.core.$InferInnerFunctionTypeAsync<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodVoid>>>]>>;
+    }, z.core.$strip>>;
+    swUrl: z.ZodDefault<z.ZodString>;
+    plugins: z.ZodDefault<z.ZodArray<z.ZodAny>>;
+    rollupFormat: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"es">, z.ZodLiteral<"iife">]>>;
+    rollupOptions: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    devOptions: z.ZodPrefault<z.ZodObject<{
+        bundle: z.ZodDefault<z.ZodBoolean>;
+        minify: z.ZodDefault<z.ZodUnion<readonly [z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
+    }, z.core.$strip>>;
+    globDirectory: z.ZodString;
+    swDest: z.ZodString;
+    injectionPoint: z.ZodDefault<z.ZodString>;
+    swSrc: z.ZodString;
+    globFollow: z.ZodDefault<z.ZodBoolean>;
+    globIgnores: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    globPatterns: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    globStrict: z.ZodDefault<z.ZodBoolean>;
+    templatedURLs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>>;
+    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>>;
-} & {
-    globFollow: z.ZodDefault<z.ZodBoolean>;
-    globIgnores: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-    globPatterns: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-    globStrict: z.ZodDefault<z.ZodBoolean>;
-    templatedURLs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>>;
-} & {
-    injectionPoint: z.ZodDefault<z.ZodString>;
-    swSrc: z.ZodString;
-} & {
-    swDest: z.ZodString;
-} & {
-    globDirectory: z.ZodString;
-} & {
-    mode: z.ZodUnion<[z.ZodLiteral<"development">, z.ZodLiteral<"production">]>;
-    type: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"classic">, z.ZodLiteral<"module">]>>;
-    scope: z.ZodString;
-    base: z.ZodString;
-    disable: z.ZodDefault<z.ZodBoolean>;
-    integration: z.ZodDefault<z.ZodObject<{
-        beforeBuildServiceWorker: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-        closeBundleOrder: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"pre">, z.ZodLiteral<"post">, z.ZodNull]>>;
-        configureOptions: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny, z.ZodAny], null>, z.ZodUnion<[z.ZodPromise<z.ZodVoid>, z.ZodVoid]>>>;
-    }, "strip", z.ZodTypeAny, {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    }, {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    }>>;
-    swUrl: z.ZodDefault<z.ZodString>;
-    plugins: z.ZodDefault<z.ZodArray<z.ZodAny, "many">>;
-    rollupFormat: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"es">, z.ZodLiteral<"iife">]>>;
-    rollupOptions: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
-    devOptions: z.ZodDefault<z.ZodObject<{
-        bundle: z.ZodDefault<z.ZodBoolean>;
-        minify: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodLiteral<"terser">, z.ZodLiteral<"esbuild">]>>;
-    }, "strip", z.ZodTypeAny, {
-        bundle: boolean;
-        minify: boolean | "terser" | "esbuild";
-    }, {
-        bundle?: boolean | undefined;
-        minify?: boolean | "terser" | "esbuild" | undefined;
-    }>>;
-}, "strict", z.ZodTypeAny, {
-    type: "classic" | "module";
-    mode: "development" | "production";
-    scope: string;
-    base: string;
-    disable: boolean;
-    integration: {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    };
-    swUrl: string;
-    plugins: any[];
-    rollupFormat: "es" | "iife";
-    rollupOptions: Record<string, any>;
-    devOptions: {
-        bundle: boolean;
-        minify: boolean | "terser" | "esbuild";
-    };
-    disablePrecacheManifest: boolean;
-    maximumFileSizeToCacheInBytes: number;
-    globFollow: boolean;
-    globIgnores: string[];
-    globPatterns: string[];
-    globStrict: boolean;
-    injectionPoint: string;
-    swSrc: string;
-    swDest: string;
-    globDirectory: string;
-    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;
-    templatedURLs?: Record<string, string | string[]> | undefined;
-}, {
-    mode: "development" | "production";
-    scope: string;
-    base: string;
-    swSrc: string;
-    swDest: string;
-    globDirectory: string;
-    type?: "classic" | "module" | undefined;
-    disable?: boolean | undefined;
-    integration?: {
-        beforeBuildServiceWorker?: ((args_0: any) => void | Promise<void>) | undefined;
-        closeBundleOrder?: "pre" | "post" | null | undefined;
-        configureOptions?: ((args_0: any, args_1: any) => void | Promise<void>) | undefined;
-    } | undefined;
-    swUrl?: string | undefined;
-    plugins?: any[] | undefined;
-    rollupFormat?: "es" | "iife" | undefined;
-    rollupOptions?: Record<string, any> | undefined;
-    devOptions?: {
-        bundle?: boolean | undefined;
-        minify?: boolean | "terser" | "esbuild" | undefined;
-    } | undefined;
-    additionalPrecacheEntries?: (string | {
-        url: string;
-        integrity?: string | undefined;
-        revision?: string | null | undefined;
-    })[] | undefined;
-    disablePrecacheManifest?: boolean | 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;
-    maximumFileSizeToCacheInBytes?: number | undefined;
-    modifyURLPrefix?: Record<string, string> | undefined;
-    globFollow?: boolean | undefined;
-    globIgnores?: string[] | undefined;
-    globPatterns?: string[] | undefined;
-    globStrict?: boolean | undefined;
-    templatedURLs?: Record<string, string | string[]> | undefined;
-    injectionPoint?: 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,KAAK;;;;;;;;;;;;EAIhB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;EAGrB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYhC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;iBAvBkC,CAAC;gBACnD,CAAC;;;iBAA4E,CAAC;gBAGjF,CAAC;;;;;;;;;;;;;iBAcR,CAAC;gBAAsC,CAAC;;;;iBAEvC,CAAC;gBAGL,CAAC;;;;;;;;;;;qBAOmM,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;;;;;;;;;;;;EAD/0B,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,KAAK;;;;iBA0BhB,CAAC;AAEH,eAAO,MAAM,UAAU;;;iBAGrB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;iBAYhC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAOhC,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,GAAU,OAAO,OAAO,KAAG,OAAO,CAAC,6BAA6B,CAMzG,CAAC"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/lib/validator.ts"],"names":[],"mappings":"AAEA,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,6 +1,6 @@
 {
   "name": "@serwist/vite",
-  "version": "9.0.15",
+  "version": "9.1.0",
   "type": "module",
   "description": "A module that integrates Serwist into your Vite application.",
   "files": [
@@ -74,19 +74,19 @@
   "dependencies": {
     "glob": "10.4.5",
     "kolorist": "1.8.0",
-    "zod": "3.25.63",
-    "@serwist/build": "9.0.15",
-    "serwist": "9.0.15"
+    "zod": "4.0.5",
+    "@serwist/build": "9.1.0",
+    "serwist": "9.1.0"
   },
   "devDependencies": {
-    "@types/node": "24.0.1",
-    "rollup": "4.43.0",
+    "@types/node": "24.0.14",
+    "rollup": "4.45.1",
     "typescript": "5.8.3",
-    "vite": "6.3.5",
-    "@serwist/configs": "9.0.15",
-    "serwist": "9.0.15",
-    "@serwist/utils": "9.0.15",
-    "@serwist/window": "9.0.15"
+    "vite": "7.0.4",
+    "@serwist/configs": "9.1.0",
+    "serwist": "9.1.0",
+    "@serwist/utils": "9.1.0",
+    "@serwist/window": "9.1.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

package/src/lib/modules.ts

@@ -39,7 +39,7 @@ export const generateServiceWorker = async (ctx: SerwistViteContext) => {
 
   const parsedSwDest = path.parse(ctx.options.injectManifest.swDest);
 
-  let injectManifestResult: BuildResult | undefined = undefined;
+  let injectManifestResult: BuildResult | undefined;
 
   if (ctx.options.injectManifest.injectionPoint) {
     await ctx.options.integration?.beforeBuildServiceWorker?.(ctx.options);

package/src/lib/schema.ts

@@ -1,10 +1,32 @@
-import { basePartial, globPartial, injectPartial, requiredGlobDirectoryPartial, requiredSwDestPartial } from "@serwist/build/schema";
+import { fn, basePartial, globPartial, injectPartial, requiredGlobDirectoryPartial, requiredSwDestPartial, asyncFn } from "@serwist/build/schema";
 import { z } from "zod";
 
 export const hooks = z.object({
-  beforeBuildServiceWorker: z.function(z.tuple([z.any()]), z.union([z.promise(z.void()), z.void()])).optional(),
+  beforeBuildServiceWorker: z
+    .union([
+      fn({
+        input: [z.any()],
+        output: z.void(),
+      }),
+      asyncFn({
+        input: [z.any()],
+        output: z.void(),
+      }),
+    ])
+    .optional(),
   closeBundleOrder: z.union([z.literal("pre"), z.literal("post"), z.null()]).optional(),
-  configureOptions: z.function(z.tuple([z.any(), z.any()]), z.union([z.promise(z.void()), z.void()])).optional(),
+  configureOptions: z
+    .union([
+      fn({
+        input: [z.any(), z.any()],
+        output: z.void(),
+      }),
+      asyncFn({
+        input: [z.any(), z.any()],
+        output: z.void(),
+      }),
+    ])
+    .optional(),
 });
 
 export const devOptions = z.object({
@@ -23,13 +45,14 @@ export const injectManifestPartial = z.object({
   plugins: z.array(z.any()).default([]),
   rollupFormat: z.union([z.literal("es"), z.literal("iife")]).default("es"),
   rollupOptions: z.record(z.string(), z.any()).default({}),
-  devOptions: devOptions.default({}),
+  devOptions: devOptions.prefault({}),
 });
 
-export const injectManifestOptions = basePartial
-  .merge(globPartial)
-  .merge(injectPartial)
-  .merge(requiredSwDestPartial)
-  .merge(requiredGlobDirectoryPartial)
-  .merge(injectManifestPartial)
-  .strict("Do not pass invalid properties to InjectManifestOptions!");
+export const injectManifestOptions = z.strictObject({
+  ...basePartial.shape,
+  ...globPartial.shape,
+  ...injectPartial.shape,
+  ...requiredSwDestPartial.shape,
+  ...requiredGlobDirectoryPartial.shape,
+  ...injectManifestPartial.shape,
+});

package/src/lib/validator.ts

@@ -1,10 +1,11 @@
 import { SerwistConfigError, validationErrorMap } from "@serwist/build/schema";
+import { z } from "zod";
 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/vite", message: JSON.stringify(result.error.format(), null, 2) });
+    throw new SerwistConfigError({ moduleName: "@serwist/vite", message: z.prettifyError(result.error) });
   }
   return result.data;
 };