@serwist/next 10.0.0-preview.8 → 10.0.0-preview.9

package/dist/chunks/schema.js

@@ -2,7 +2,7 @@ import { requiredSwDestPartial } from '@serwist/build/schema';
 import { injectManifestOptions as injectManifestOptions$1 } from '@serwist/webpack-plugin/schema';
 import { z } from 'zod';
 
-const injectPartial = z.object({
+const injectPartial = z.strictObject({
     cacheOnNavigation: z.boolean().default(false),
     disable: z.boolean().default(false),
     register: z.boolean().default(true),
@@ -12,9 +12,13 @@ const injectPartial = z.object({
     globPublicPatterns: z.array(z.string()).default([
         "**/*"
     ])
-}).strict("Do not pass invalid properties to NextInjectManifestPartial!");
-const injectManifestOptions = injectManifestOptions$1.merge(requiredSwDestPartial).merge(injectPartial).omit({
+});
+const injectManifestOptions = z.strictObject({
+    ...injectManifestOptions$1.shape,
+    ...requiredSwDestPartial.shape,
+    ...injectPartial.shape
+}).omit({
     disablePrecacheManifest: true
-}).strict("Do not pass invalid properties to NextInjectManifestOptions!");
+});
 
 export { injectManifestOptions as a, injectPartial as i };

package/dist/index.js

@@ -1,16 +1,16 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { getFileHash } from '@serwist/utils/node';
 import { InjectManifest } from '@serwist/webpack-plugin';
 import { ChildCompilationPlugin, relativeToOutputPath } from '@serwist/webpack-plugin/internal';
-import { getFileHash } from '@serwist/utils/node';
 import { globSync } from 'glob';
 import { createRequire } from 'node:module';
 import chalk from 'chalk';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
+import { z } from 'zod';
 import { a as injectManifestOptions } from './chunks/schema.js';
 import '@serwist/webpack-plugin/schema';
-import 'zod';
 
 const findFirstTruthy = (arr, fn)=>{
     for (const i of arr){
@@ -84,12 +84,12 @@ const event = (...message)=>{
 
 const validateInjectManifestOptions = (input)=>{
     const result = injectManifestOptions.safeParse(input, {
-        errorMap: validationErrorMap
+        error: validationErrorMap
     });
     if (!result.success) {
         throw new SerwistConfigError({
             moduleName: "@serwist/next",
-            message: JSON.stringify(result.error.format(), null, 2)
+            message: z.prettifyError(result.error)
         });
     }
     return result.data;
@@ -191,8 +191,8 @@ const withSerwistInit = (userOptions)=>{
                         });
                     }
                     const shouldBuildSWEntryWorker = cacheOnNavigation;
-                    let swEntryPublicPath = undefined;
-                    let swEntryWorkerDest = undefined;
+                    let swEntryPublicPath;
+                    let swEntryWorkerDest;
                     if (shouldBuildSWEntryWorker) {
                         const swEntryWorkerSrc = path.join(dirname, "sw-entry-worker.js");
                         const swEntryName = `swe-worker-${getContentHash(swEntryWorkerSrc, dev)}.js`;
@@ -234,7 +234,7 @@ const withSerwistInit = (userOptions)=>{
                             ({ asset, compilation })=>{
                                 const swDestRelativeOutput = relativeToOutputPath(compilation, swDest);
                                 const swAsset = compilation.getAsset(swDestRelativeOutput);
-                                return asset.name === swAsset?.name || asset.name.startsWith("server/") || /^[^\/]*\.json$/.test(asset.name) || dev && !asset.name.startsWith("static/runtime/");
+                                return asset.name === swAsset?.name || asset.name.startsWith("server/") || /^[^/]*\.json$/.test(asset.name) || dev && !asset.name.startsWith("static/runtime/");
                             }
                         ],
                         manifestTransforms: [

package/dist/lib/schema.d.ts

@@ -6,240 +6,85 @@ export declare const injectPartial: z.ZodObject<{
     reloadOnOnline: z.ZodDefault<z.ZodBoolean>;
     scope: z.ZodOptional<z.ZodString>;
     swUrl: z.ZodDefault<z.ZodString>;
-    globPublicPatterns: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-}, "strict", z.ZodTypeAny, {
-    cacheOnNavigation: boolean;
-    disable: boolean;
-    register: boolean;
-    reloadOnOnline: boolean;
-    swUrl: string;
-    globPublicPatterns: string[];
-    scope?: string | undefined;
-}, {
-    cacheOnNavigation?: boolean | undefined;
-    disable?: boolean | undefined;
-    register?: boolean | undefined;
-    reloadOnOnline?: boolean | undefined;
-    scope?: string | undefined;
-    swUrl?: string | undefined;
-    globPublicPatterns?: string[] | undefined;
-}>;
-export declare const injectManifestOptions: z.ZodObject<Omit<{
-    additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    globPublicPatterns: z.ZodDefault<z.ZodArray<z.ZodString>>;
+}, z.core.$strict>;
+export declare const injectManifestOptions: z.ZodObject<{
+    cacheOnNavigation: z.ZodDefault<z.ZodBoolean>;
+    disable: z.ZodDefault<z.ZodBoolean>;
+    register: z.ZodDefault<z.ZodBoolean>;
+    reloadOnOnline: z.ZodDefault<z.ZodBoolean>;
+    scope: z.ZodOptional<z.ZodString>;
+    swUrl: z.ZodDefault<z.ZodString>;
+    globPublicPatterns: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    swDest: z.ZodString;
+    compileSrc: z.ZodDefault<z.ZodBoolean>;
+    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">>;
-    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.core.$strict>]>>>;
+    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>;
-    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny, "many">>;
-} & {
-    swDest: z.ZodString;
-} & {
-    cacheOnNavigation: z.ZodDefault<z.ZodBoolean>;
-    disable: z.ZodDefault<z.ZodBoolean>;
-    register: z.ZodDefault<z.ZodBoolean>;
-    reloadOnOnline: z.ZodDefault<z.ZodBoolean>;
-    scope: z.ZodOptional<z.ZodString>;
-    swUrl: z.ZodDefault<z.ZodString>;
-    globPublicPatterns: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-}, "disablePrecacheManifest">, "strict", z.ZodTypeAny, {
-    cacheOnNavigation: boolean;
-    disable: boolean;
-    register: boolean;
-    reloadOnOnline: boolean;
-    swUrl: string;
-    globPublicPatterns: string[];
-    maximumFileSizeToCacheInBytes: number;
-    exclude: (string | RegExp | ((args_0: any) => boolean))[];
-    injectionPoint: string;
-    swSrc: string;
-    compileSrc: boolean;
-    swDest: string;
-    scope?: 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;
-    chunks?: string[] | undefined;
-    excludeChunks?: string[] | undefined;
-    include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    webpackCompilationPlugins?: any[] | undefined;
-}, {
-    swSrc: string;
-    swDest: string;
-    cacheOnNavigation?: boolean | undefined;
-    disable?: boolean | undefined;
-    register?: boolean | undefined;
-    reloadOnOnline?: boolean | undefined;
-    scope?: string | undefined;
-    swUrl?: string | undefined;
-    globPublicPatterns?: 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;
-    maximumFileSizeToCacheInBytes?: number | undefined;
-    modifyURLPrefix?: Record<string, string> | undefined;
-    chunks?: string[] | undefined;
-    exclude?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    excludeChunks?: string[] | undefined;
-    include?: (string | RegExp | ((args_0: any) => boolean))[] | undefined;
-    injectionPoint?: string | undefined;
-    compileSrc?: boolean | undefined;
-    webpackCompilationPlugins?: any[] | 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":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;EAU+C,CAAC;AAE1E,eAAO,MAAM,qBAAqB;;;;;;;iBAKm8B,CAAC;gBAAsC,CAAC;;;iBAA4E,CAAC;gBAAsC,CAAC;;;;;;;;;;;;;iBAA4iB,CAAC;gBAAsC,CAAC;;;;iBAAkG,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;;;;;;;;;;;;;EADj7F,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,aAAa;;;;;;;;kBAQxB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAMQ,CAAC"}

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

@@ -1 +1 @@
-{"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,GAAI,OAAO,OAAO,KAAG,6BAQ9D,CAAC"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/lib/validator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,6BAA6B,GAAI,OAAO,OAAO,KAAG,6BAQ9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "10.0.0-preview.8",
+  "version": "10.0.0-preview.9",
   "type": "module",
   "sideEffects": false,
   "description": "A module that integrates Serwist into your Next.js application.",
@@ -64,24 +64,24 @@
   },
   "dependencies": {
     "chalk": "5.4.1",
-    "glob": "11.0.1",
-    "zod": "3.24.3",
-    "@serwist/build": "10.0.0-preview.8",
-    "@serwist/utils": "10.0.0-preview.8",
-    "@serwist/webpack-plugin": "10.0.0-preview.8",
-    "@serwist/window": "10.0.0-preview.8",
-    "serwist": "10.0.0-preview.8"
+    "glob": "11.0.3",
+    "zod": "4.0.5",
+    "@serwist/build": "10.0.0-preview.9",
+    "@serwist/utils": "10.0.0-preview.9",
+    "@serwist/webpack-plugin": "10.0.0-preview.9",
+    "@serwist/window": "10.0.0-preview.9",
+    "serwist": "10.0.0-preview.9"
   },
   "devDependencies": {
-    "@types/node": "22.14.1",
-    "next": "15.3.1",
+    "@types/node": "24.0.14",
+    "next": "15.4.1",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "rollup": "4.40.0",
-    "type-fest": "4.40.0",
+    "rollup": "4.45.1",
+    "type-fest": "4.41.0",
     "typescript": "5.8.3",
-    "webpack": "5.99.6",
-    "@serwist/configs": "10.0.0-preview.8"
+    "webpack": "5.100.2",
+    "@serwist/configs": "10.0.0-preview.9"
   },
   "peerDependencies": {
     "next": ">=14.0.0",

package/src/index.ts

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { getFileHash } from "@serwist/utils/node";
 import { InjectManifest } from "@serwist/webpack-plugin";
 import { ChildCompilationPlugin, relativeToOutputPath } from "@serwist/webpack-plugin/internal";
-import { getFileHash } from "@serwist/utils/node";
 import { globSync } from "glob";
 import type { NextConfig } from "next";
 import type { Compilation, Configuration, default as Webpack } from "webpack";
@@ -147,8 +147,8 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
         }
 
         const shouldBuildSWEntryWorker = cacheOnNavigation;
-        let swEntryPublicPath: string | undefined = undefined;
-        let swEntryWorkerDest: string | undefined = undefined;
+        let swEntryPublicPath: string | undefined;
+        let swEntryWorkerDest: string | undefined;
 
         if (shouldBuildSWEntryWorker) {
           const swEntryWorkerSrc = path.join(dirname, "sw-entry-worker.js");
@@ -207,7 +207,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
                   // This excludes all JSON files in the compilation directory by filtering
                   // out paths that have slashes or don't end with `.json`. Only said files
                   // match this criterion.
-                  /^[^\/]*\.json$/.test(asset.name) ||
+                  /^[^/]*\.json$/.test(asset.name) ||
                   (dev && !asset.name.startsWith("static/runtime/"))
                 );
               },

package/src/lib/schema.ts

@@ -2,20 +2,20 @@ import { requiredSwDestPartial } from "@serwist/build/schema";
 import { injectManifestOptions as webpackInjectManifestOptions } from "@serwist/webpack-plugin/schema";
 import { z } from "zod";
 
-export const injectPartial = z
-  .object({
-    cacheOnNavigation: z.boolean().default(false),
-    disable: z.boolean().default(false),
-    register: z.boolean().default(true),
-    reloadOnOnline: z.boolean().default(true),
-    scope: z.string().optional(),
-    swUrl: z.string().default("/sw.js"),
-    globPublicPatterns: z.array(z.string()).default(["**/*"]),
-  })
-  .strict("Do not pass invalid properties to NextInjectManifestPartial!");
+export const injectPartial = z.strictObject({
+  cacheOnNavigation: z.boolean().default(false),
+  disable: z.boolean().default(false),
+  register: z.boolean().default(true),
+  reloadOnOnline: z.boolean().default(true),
+  scope: z.string().optional(),
+  swUrl: z.string().default("/sw.js"),
+  globPublicPatterns: z.array(z.string()).default(["**/*"]),
+});
 
-export const injectManifestOptions = webpackInjectManifestOptions
-  .merge(requiredSwDestPartial)
-  .merge(injectPartial)
-  .omit({ disablePrecacheManifest: true })
-  .strict("Do not pass invalid properties to NextInjectManifestOptions!");
+export const injectManifestOptions = z
+  .strictObject({
+    ...webpackInjectManifestOptions.shape,
+    ...requiredSwDestPartial.shape,
+    ...injectPartial.shape,
+  })
+  .omit({ disablePrecacheManifest: true });

package/src/lib/validator.ts

@@ -1,13 +1,14 @@
 import { SerwistConfigError, validationErrorMap } from "@serwist/build/schema";
+import { z } from "zod";
 import { injectManifestOptions } from "./schema.js";
 import type { InjectManifestOptionsComplete } from "./types.js";
 
 export const validateInjectManifestOptions = (input: unknown): InjectManifestOptionsComplete => {
   const result = injectManifestOptions.safeParse(input, {
-    errorMap: validationErrorMap,
+    error: validationErrorMap,
   });
   if (!result.success) {
-    throw new SerwistConfigError({ moduleName: "@serwist/next", message: JSON.stringify(result.error.format(), null, 2) });
+    throw new SerwistConfigError({ moduleName: "@serwist/next", message: z.prettifyError(result.error) });
   }
   return result.data;
 };