@serwist/next 10.0.0-preview.1 → 10.0.0-preview.11

package/dist/chunks/schema.js

@@ -1,8 +1,8 @@
-import { requiredSwDestPartial } from '@serwist/build/schema';
+import { requiredSwDestPartial, assertType } 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,17 @@ 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!");
+});
+assertType();
+assertType();
+assertType();
+assertType();
 
 export { injectManifestOptions as a, injectPartial as i };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAInE;;;;GAIG;AACH,QAAA,MAAM,eAAe,gBAAiB,qBAAqB,KAAG,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,KAAK,UAAU,CAuNrG,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAMnE;;;;GAIG;AACH,QAAA,MAAM,eAAe,GAAI,aAAa,qBAAqB,KAAG,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,KAAK,UAAU,CA8NrG,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}

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 { globSync } from 'glob';
-import crypto from 'node:crypto';
 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){
@@ -22,8 +22,6 @@ const findFirstTruthy = (arr, fn)=>{
     return undefined;
 };
 
-const getFileHash = (file)=>crypto.createHash("md5").update(fs.readFileSync(file)).digest("hex");
-
 const getContentHash = (file, isDev)=>{
     if (isDev) {
         return "development";
@@ -86,19 +84,24 @@ 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;
 };
 
 const dirname = "__dirname" in globalThis ? __dirname : fileURLToPath(new URL(".", import.meta.url));
+let warnedTurbopack = false;
 const withSerwistInit = (userOptions)=>{
+    if (!warnedTurbopack && process.env.TURBOPACK && !userOptions.disable && !process.env.SERWIST_SUPPRESS_TURBOPACK_WARNING) {
+        warnedTurbopack = true;
+        console.warn(`[@serwist/next] WARNING: You are using '@serwist/next' with \`next dev --turbopack\`, but Serwist doesn't support Turbopack at the moment. It is recommended that you set \`disable\` to \`process.env.NODE_ENV !== \"production\"\`. Follow https://github.com/serwist/serwist/issues/54 for progress on Serwist + Turbopack. You can also suppress this warning by setting SERWIST_SUPPRESS_TURBOPACK_WARNING=1.`);
+    }
     return (nextConfig = {})=>({
             ...nextConfig,
             webpack (config, options) {
@@ -188,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`;
@@ -231,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: [
@@ -244,7 +247,7 @@ const withSerwistInit = (userOptions)=>{
                                     if (m.url.startsWith(publicFilesPrefix)) {
                                         m.url = path.posix.join(basePath, m.url.replace(publicFilesPrefix, ""));
                                     }
-                                    m.url = m.url.replace(/\[/g, "%5B").replace(/\]/g, "%5D");
+                                    m.url = m.url.replace(/\[/g, "%5B").replace(/\]/g, "%5D").replace(/@/g, "%40");
                                     return m;
                                 });
                                 return {

package/dist/lib/find-first-truthy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-first-truthy.d.ts","sourceRoot":"","sources":["../../src/lib/find-first-truthy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,+BAQhE,CAAC"}
+{"version":3,"file":"find-first-truthy.d.ts","sourceRoot":"","sources":["../../src/lib/find-first-truthy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,+BAQhE,CAAC"}

package/dist/lib/get-content-hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-content-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-content-hash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAI9B,eAAO,MAAM,cAAc,SAAU,EAAE,CAAC,oBAAoB,SAAS,OAAO,WAK3E,CAAC"}
+{"version":3,"file":"get-content-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-content-hash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAG9B,eAAO,MAAM,cAAc,GAAI,MAAM,EAAE,CAAC,oBAAoB,EAAE,OAAO,OAAO,WAK3E,CAAC"}

package/dist/lib/get-package-version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-package-version.d.ts","sourceRoot":"","sources":["../../src/lib/get-package-version.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAMhE,CAAC"}
+{"version":3,"file":"get-package-version.d.ts","sourceRoot":"","sources":["../../src/lib/get-package-version.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MAAM,GAAG,SAMhE,CAAC"}

package/dist/lib/index.d.ts

@@ -1,6 +1,5 @@
 export { findFirstTruthy } from "./find-first-truthy.js";
 export { getContentHash } from "./get-content-hash.js";
-export { getFileHash } from "./get-file-hash.js";
 export { getPackageVersion } from "./get-package-version.js";
 export { loadTSConfig } from "./load-tsconfig.js";
 export * as logger from "./logger.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC"}

package/dist/lib/load-tsconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-tsconfig.d.ts","sourceRoot":"","sources":["../../src/lib/load-tsconfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9D,eAAO,MAAM,YAAY,YAAa,MAAM,wBAAwB,MAAM,GAAG,SAAS,KAAG,YAAY,GAAG,SAevG,CAAC"}
+{"version":3,"file":"load-tsconfig.d.ts","sourceRoot":"","sources":["../../src/lib/load-tsconfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9D,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,EAAE,sBAAsB,MAAM,GAAG,SAAS,KAAG,YAAY,GAAG,SAevG,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,eAAgB,GAAG,EAAE,SAEtC,CAAC;AAEF,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,eAAgB,GAAG,EAAE,SAEtC,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAEtC,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAEtC,CAAC"}

package/dist/lib/schema.d.ts

@@ -6,246 +6,29 @@ 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<z.objectUtil.extendShape<z.objectUtil.extendShape<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">>;
-    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">>;
-    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">>;
-}>, {
-    swDest: z.ZodString;
-}>, {
+    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, "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;
-    swDest: string;
-    compileSrc: boolean;
-    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;
-}>;
+    globPublicPatterns: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    scope: z.ZodOptional<z.ZodString>;
+    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>>]>>>;
+    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>>;
+    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>>]>>>;
+    injectionPoint: z.ZodPrefault<z.ZodString>;
+    swSrc: z.ZodString;
+    compileSrc: z.ZodDefault<z.ZodBoolean>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    swDest: z.ZodString;
+}, 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":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,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,UAAW,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,7 +1,8 @@
 {
   "name": "@serwist/next",
-  "version": "10.0.0-preview.1",
+  "version": "10.0.0-preview.11",
   "type": "module",
+  "sideEffects": false,
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
     "src",
@@ -21,7 +22,7 @@
     "pwa"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "author": "Serwist <ducanh2912.rusty@gmail.com> (https://serwist.pages.dev/)",
   "license": "MIT",
@@ -63,24 +64,24 @@
   },
   "dependencies": {
     "chalk": "5.4.1",
-    "glob": "10.4.5",
-    "zod": "3.24.2",
-    "@serwist/build": "10.0.0-preview.1",
-    "@serwist/utils": "10.0.0-preview.1",
-    "@serwist/webpack-plugin": "10.0.0-preview.1",
-    "@serwist/window": "10.0.0-preview.1",
-    "serwist": "10.0.0-preview.1"
+    "glob": "11.0.3",
+    "zod": "4.0.5",
+    "@serwist/build": "10.0.0-preview.11",
+    "@serwist/utils": "10.0.0-preview.11",
+    "@serwist/webpack-plugin": "10.0.0-preview.11",
+    "@serwist/window": "10.0.0-preview.11",
+    "serwist": "10.0.0-preview.11"
   },
   "devDependencies": {
-    "@types/node": "22.13.5",
-    "next": "15.1.7",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
-    "rollup": "4.34.8",
-    "type-fest": "4.35.0",
-    "typescript": "5.7.3",
-    "webpack": "5.98.0",
-    "@serwist/configs": "10.0.0-preview.1"
+    "@types/node": "24.0.14",
+    "next": "15.4.1",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "rollup": "4.45.1",
+    "type-fest": "4.41.0",
+    "typescript": "5.8.3",
+    "webpack": "5.100.2",
+    "@serwist/configs": "10.0.0-preview.11"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
@@ -95,6 +96,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/index.ts

@@ -1,24 +1,33 @@
 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 { globSync } from "glob";
 import type { NextConfig } from "next";
 import type { Compilation, Configuration, default as Webpack } from "webpack";
 import type { ExcludeParams, SerwistNextOptions, SerwistNextOptionsKey } from "./internal-types.js";
-import { getContentHash, getFileHash, loadTSConfig, logger } from "./lib/index.js";
+import { getContentHash, loadTSConfig, logger } from "./lib/index.js";
 import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./lib/types.js";
 import { validateInjectManifestOptions } from "./lib/validator.js";
 
 const dirname = "__dirname" in globalThis ? __dirname : fileURLToPath(new URL(".", import.meta.url));
 
+let warnedTurbopack = false;
+
 /**
  * Integrates Serwist into your Next.js app.
  * @param userOptions
  * @returns
  */
 const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: NextConfig) => NextConfig) => {
+  if (!warnedTurbopack && process.env.TURBOPACK && !userOptions.disable && !process.env.SERWIST_SUPPRESS_TURBOPACK_WARNING) {
+    warnedTurbopack = true;
+    console.warn(
+      `[@serwist/next] WARNING: You are using '@serwist/next' with \`next dev --turbopack\`, but Serwist doesn't support Turbopack at the moment. It is recommended that you set \`disable\` to \`process.env.NODE_ENV !== \"production\"\`. Follow https://github.com/serwist/serwist/issues/54 for progress on Serwist + Turbopack. You can also suppress this warning by setting SERWIST_SUPPRESS_TURBOPACK_WARNING=1.`,
+    );
+  }
   return (nextConfig = {}) => ({
     ...nextConfig,
     webpack(config: Configuration, options) {
@@ -138,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");
@@ -198,12 +207,13 @@ 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/"))
                 );
               },
             ],
             manifestTransforms: [
+              // TODO(ducanhgh): move this spread to below our transform function?
               ...manifestTransforms,
               async (manifestEntries, compilation) => {
                 // This path always uses forward slashes, so it is safe to use it in the following string replace.
@@ -219,7 +229,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
                   if (m.url.startsWith(publicFilesPrefix)) {
                     m.url = path.posix.join(basePath, m.url.replace(publicFilesPrefix, ""));
                   }
-                  m.url = m.url.replace(/\[/g, "%5B").replace(/\]/g, "%5D");
+                  m.url = m.url.replace(/\[/g, "%5B").replace(/\]/g, "%5D").replace(/@/g, "%40");
                   return m;
                 });
                 return { manifest, warnings: [] };

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

@@ -1,6 +1,5 @@
 import type fs from "node:fs";
-
-import { getFileHash } from "./get-file-hash.js";
+import { getFileHash } from "@serwist/utils/node";
 
 export const getContentHash = (file: fs.PathOrFileDescriptor, isDev: boolean) => {
   if (isDev) {

package/src/lib/index.ts

@@ -1,6 +1,5 @@
 export { findFirstTruthy } from "./find-first-truthy.js";
 export { getContentHash } from "./get-content-hash.js";
-export { getFileHash } from "./get-file-hash.js";
 export { getPackageVersion } from "./get-package-version.js";
 export { loadTSConfig } from "./load-tsconfig.js";
 export * as logger from "./logger.js";

package/src/lib/schema.ts

@@ -1,21 +1,27 @@
-import { requiredSwDestPartial } from "@serwist/build/schema";
+import { assertType, type Equals, requiredSwDestPartial } from "@serwist/build/schema";
 import { injectManifestOptions as webpackInjectManifestOptions } from "@serwist/webpack-plugin/schema";
 import { z } from "zod";
+import type { InjectManifestOptions, InjectManifestOptionsComplete, InjectPartial, InjectResolved } from "./types.js";
 
-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(["**/*"]),
+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 = z
+  .strictObject({
+    ...webpackInjectManifestOptions.shape,
+    ...requiredSwDestPartial.shape,
+    ...injectPartial.shape,
   })
-  .strict("Do not pass invalid properties to NextInjectManifestPartial!");
+  .omit({ disablePrecacheManifest: true });
 
-export const injectManifestOptions = webpackInjectManifestOptions
-  .merge(requiredSwDestPartial)
-  .merge(injectPartial)
-  .omit({ disablePrecacheManifest: true })
-  .strict("Do not pass invalid properties to NextInjectManifestOptions!");
+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/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;
 };

package/dist/lib/get-file-hash.d.ts

@@ -1,3 +0,0 @@
-import fs from "node:fs";
-export declare const getFileHash: (file: fs.PathOrFileDescriptor) => string;
-//# sourceMappingURL=get-file-hash.d.ts.map

package/dist/lib/get-file-hash.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-file-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-file-hash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,WAAW,SAAU,EAAE,CAAC,oBAAoB,WAAyE,CAAC"}

package/dist/utils.d.ts

@@ -1,4 +0,0 @@
-import fs from "node:fs";
-export declare const getFileHash: (file: fs.PathOrFileDescriptor) => string;
-export declare const getContentHash: (file: fs.PathOrFileDescriptor, isDev: boolean) => string;
-//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,WAAW,SAAU,EAAE,CAAC,oBAAoB,WAAyE,CAAC;AAEnI,eAAO,MAAM,cAAc,SAAU,EAAE,CAAC,oBAAoB,SAAS,OAAO,WAK3E,CAAC"}

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

@@ -1,4 +0,0 @@
-import crypto from "node:crypto";
-import fs from "node:fs";
-
-export const getFileHash = (file: fs.PathOrFileDescriptor) => crypto.createHash("md5").update(fs.readFileSync(file)).digest("hex");

package/src/utils.ts

@@ -1,11 +0,0 @@
-import crypto from "node:crypto";
-import fs from "node:fs";
-
-export const getFileHash = (file: fs.PathOrFileDescriptor) => crypto.createHash("md5").update(fs.readFileSync(file)).digest("hex");
-
-export const getContentHash = (file: fs.PathOrFileDescriptor, isDev: boolean) => {
-  if (isDev) {
-    return "development";
-  }
-  return getFileHash(file).slice(0, 16);
-};