@serwist/next 9.2.3 → 9.3.1

package/dist/index.config.d.ts

@@ -0,0 +1,7 @@
+import type { BuildOptions } from "@serwist/cli";
+import type { SerwistOptions } from "./lib/config/types.js";
+import { generateGlobPatterns } from "./lib/config/utils.js";
+export declare const serwist: (options: SerwistOptions) => Promise<BuildOptions>;
+export { generateGlobPatterns };
+export type { SerwistOptions };
+//# sourceMappingURL=index.config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.config.d.ts","sourceRoot":"","sources":["../src/index.config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAI7D,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CA4E3E,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,YAAY,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.config.js

@@ -0,0 +1,100 @@
+import { createRequire } from 'module';
+import fs from 'node:fs';
+import path from 'node:path';
+import { rebasePath } from '@serwist/build';
+import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from 'next/constants.js';
+
+const generateGlobPatterns = (distDir)=>[
+        `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
+        "public/**/*"
+    ];
+
+const __require = createRequire(import.meta.url);
+const loadNextConfig = __require("next/dist/server/config.js");
+const serwist = async (options)=>{
+    const isWatch = process.env.SERWIST_ENV === "watch";
+    const nextPhase = isWatch ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
+    const config = await loadNextConfig.default(nextPhase, process.cwd(), {
+        silent: false
+    });
+    const basePath = config.basePath || "/";
+    let distDir = config.distDir;
+    if (distDir[0] === "/") distDir = distDir.slice(1);
+    if (distDir[distDir.length - 1] !== "/") distDir += "/";
+    const distServerDir = `${distDir}server/`;
+    const distAppDir = `${distServerDir}app/`;
+    const distPagesDir = `${distServerDir}pages/`;
+    const { precachePrerendered = true, globDirectory = process.cwd(), ...cliOptions } = options;
+    for (const file of [
+        cliOptions.swDest,
+        `${cliOptions.swDest}.map`
+    ]){
+        fs.rmSync(file, {
+            force: true
+        });
+    }
+    return {
+        dontCacheBustURLsMatching: new RegExp(`^${distDir}static/`),
+        disablePrecacheManifest: isWatch,
+        ...cliOptions,
+        globDirectory,
+        globPatterns: [
+            ...cliOptions.globPatterns ?? generateGlobPatterns(distDir),
+            ...precachePrerendered ? [
+                `${distServerDir}{app,pages}/**/*.html`
+            ] : []
+        ],
+        globIgnores: [
+            `${distAppDir}**/_not-found.html`,
+            `${distPagesDir}404.html`,
+            `${distPagesDir}500.html`,
+            ...cliOptions.globIgnores ?? [],
+            rebasePath({
+                baseDirectory: globDirectory,
+                file: cliOptions.swSrc
+            }),
+            rebasePath({
+                baseDirectory: globDirectory,
+                file: cliOptions.swDest
+            }),
+            rebasePath({
+                baseDirectory: globDirectory,
+                file: `${cliOptions.swDest}.map`
+            })
+        ],
+        manifestTransforms: [
+            ...cliOptions.manifestTransforms ?? [],
+            (manifestEntries)=>{
+                const manifest = manifestEntries.map((m)=>{
+                    if (m.url.startsWith(distAppDir)) {
+                        m.url = m.url.slice(distAppDir.length - 1);
+                    }
+                    if (m.url.startsWith(distPagesDir)) {
+                        m.url = m.url.slice(distPagesDir.length - 1);
+                    }
+                    if (m.url.endsWith(".html")) {
+                        if (m.url.endsWith("/index.html")) {
+                            m.url = m.url.slice(0, m.url.lastIndexOf("/") + 1);
+                        } else {
+                            m.url = m.url.substring(0, m.url.lastIndexOf("."));
+                        }
+                        m.url = path.posix.join(basePath, m.url);
+                    }
+                    if (m.url.startsWith(distDir)) {
+                        m.url = `${config.assetPrefix ?? ""}/_next/${m.url.slice(distDir.length)}`;
+                    }
+                    if (m.url.startsWith("public/")) {
+                        m.url = path.posix.join(basePath, m.url.slice(7));
+                    }
+                    return m;
+                });
+                return {
+                    manifest,
+                    warnings: []
+                };
+            }
+        ]
+    };
+};
+
+export { generateGlobPatterns, serwist };

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;AAMnE;;;;GAIG;AACH,QAAA,MAAM,eAAe,GAAI,aAAa,qBAAqB,KAAG,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,KAAK,UAAU,CAgOrG,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":"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;AAMnE;;;;GAIG;AACH,QAAA,MAAM,eAAe,GAAI,aAAa,qBAAqB,KAAG,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,KAAK,UAAU,CA6NrG,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

@@ -6,7 +6,8 @@ import { ChildCompilationPlugin, relativeToOutputPath } from '@serwist/webpack-p
 import { globSync } from 'glob';
 import crypto from 'node:crypto';
 import { createRequire } from 'node:module';
-import chalk from 'chalk';
+import { green, bold, white, yellow, red } from 'kolorist';
+import semver from 'semver';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 import { z } from 'zod';
 import { a as injectManifestOptions } from './chunks/schema.js';
@@ -51,38 +52,44 @@ const loadTSConfig = (baseDir, relativeTSConfigPath)=>{
     }
 };
 
-const mapLoggingMethodToConsole = {
-    wait: "log",
-    error: "error",
-    warn: "warn",
-    info: "log",
-    event: "log"
-};
-const prefixes = {
-    wait: `${chalk.white(chalk.bold("○"))} (serwist)`,
-    error: `${chalk.red(chalk.bold("X"))} (serwist)`,
-    warn: `${chalk.yellow(chalk.bold("⚠"))} (serwist)`,
-    info: `${chalk.white(chalk.bold("○"))} (serwist)`,
-    event: `${chalk.green(chalk.bold("✓"))} (serwist)`
-};
+const require$1 = createRequire(import.meta.url);
+const LOGGING_SPACE_PREFIX = semver.gte(require$1("next/package.json").version, "16.0.0") ? "" : " ";
 const prefixedLog = (prefixType, ...message)=>{
-    const consoleMethod = mapLoggingMethodToConsole[prefixType];
-    const prefix = prefixes[prefixType];
+    let prefix;
+    let consoleMethod;
+    switch(prefixType){
+        case "wait":
+            prefix = `${white(bold("○"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+        case "error":
+            prefix = `${red(bold("X"))} (serwist)`;
+            consoleMethod = "error";
+            break;
+        case "warn":
+            prefix = `${yellow(bold("⚠"))} (serwist)`;
+            consoleMethod = "warn";
+            break;
+        case "info":
+            prefix = `${white(bold("○"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+        case "event":
+            prefix = `${green(bold("✓"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+    }
     if ((message[0] === "" || message[0] === undefined) && message.length === 1) {
         message.shift();
     }
     if (message.length === 0) {
         console[consoleMethod]("");
     } else {
-        console[consoleMethod](` ${prefix}`, ...message);
+        console[consoleMethod](`${LOGGING_SPACE_PREFIX}${prefix}`, ...message);
     }
 };
-const info = (...message)=>{
-    prefixedLog("info", ...message);
-};
-const event = (...message)=>{
-    prefixedLog("event", ...message);
-};
+const info = (...message)=>prefixedLog("info", ...message);
+const event = (...message)=>prefixedLog("event", ...message);
 
 const validateInjectManifestOptions = (input)=>{
     const result = injectManifestOptions.safeParse(input, {
@@ -102,7 +109,7 @@ 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.`);
+        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,
@@ -187,10 +194,8 @@ const withSerwistInit = (userOptions)=>{
                         cwd: destDir
                     });
                     for (const file of cleanUpList){
-                        fs.rm(file, {
+                        fs.rmSync(file, {
                             force: true
-                        }, (err)=>{
-                            if (err) throw err;
                         });
                     }
                     const shouldBuildSWEntryWorker = cacheOnNavigation;

package/dist/index.react.d.ts

@@ -0,0 +1,19 @@
+import { Serwist } from "@serwist/window";
+import { type ReactNode } from "react";
+import { useSerwist } from "./lib/context.js";
+export interface SerwistProviderProps {
+    swUrl: string;
+    register?: boolean;
+    cacheOnNavigation?: boolean;
+    reloadOnOnline?: boolean;
+    options?: RegistrationOptions;
+    children?: ReactNode;
+}
+declare global {
+    interface Window {
+        serwist: Serwist;
+    }
+}
+export declare function SerwistProvider({ swUrl, register, cacheOnNavigation, reloadOnOnline, options, children, }: SerwistProviderProps): import("react").JSX.Element;
+export { useSerwist };
+//# sourceMappingURL=index.react.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.react.d.ts","sourceRoot":"","sources":["../src/index.react.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAkB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,OAAO,CAAC;KAClB;CACF;AAED,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,QAAe,EACf,iBAAwB,EACxB,cAAqB,EACrB,OAAO,EACP,QAAQ,GACT,EAAE,oBAAoB,+BAwDtB;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/index.react.js

@@ -0,0 +1,93 @@
+import { jsx } from 'react/jsx-runtime';
+import { Serwist } from '@serwist/window';
+import { isCurrentPageOutOfScope } from '@serwist/window/internal';
+import { createContext, useContext, useState, useEffect } from 'react';
+
+const SerwistContext = createContext(null);
+const useSerwist = ()=>{
+    const context = useContext(SerwistContext);
+    if (!context) {
+        throw new Error("[useSerwist]: 'SerwistContext' is not available.");
+    }
+    return context;
+};
+
+function SerwistProvider({ swUrl, register = true, cacheOnNavigation = true, reloadOnOnline = true, options, children }) {
+    const [serwist] = useState(()=>{
+        if (typeof window === "undefined") return null;
+        if (!(window.serwist && window.serwist instanceof Serwist) && "serviceWorker" in navigator) {
+            window.serwist = new Serwist(swUrl, {
+                ...options,
+                type: options?.type || "module",
+                scope: options?.scope || "/"
+            });
+        }
+        return window.serwist ?? null;
+    });
+    useEffect(()=>{
+        const scope = options?.scope || "/";
+        if (register && !isCurrentPageOutOfScope(scope)) {
+            void serwist?.register();
+        }
+    }, [
+        register,
+        options?.scope,
+        serwist?.register
+    ]);
+    useEffect(()=>{
+        const cacheUrls = async (url)=>{
+            if (!window.navigator.onLine || !url) {
+                return;
+            }
+            serwist?.messageSW({
+                type: "CACHE_URLS",
+                payload: {
+                    urlsToCache: [
+                        url
+                    ]
+                }
+            });
+        };
+        const cacheCurrentPathname = ()=>cacheUrls(window.location.pathname);
+        const pushState = history.pushState;
+        const replaceState = history.replaceState;
+        if (cacheOnNavigation) {
+            history.pushState = (...args)=>{
+                pushState.apply(history, args);
+                cacheUrls(args[2]);
+            };
+            history.replaceState = (...args)=>{
+                replaceState.apply(history, args);
+                cacheUrls(args[2]);
+            };
+            window.addEventListener("online", cacheCurrentPathname);
+        }
+        return ()=>{
+            history.pushState = pushState;
+            history.replaceState = replaceState;
+            window.removeEventListener("online", cacheCurrentPathname);
+        };
+    }, [
+        serwist?.messageSW,
+        cacheOnNavigation
+    ]);
+    useEffect(()=>{
+        const reload = ()=>location.reload();
+        if (reloadOnOnline) {
+            window.addEventListener("online", reload);
+        }
+        return ()=>{
+            window.removeEventListener("online", reload);
+        };
+    }, [
+        reloadOnOnline
+    ]);
+    return jsx(SerwistContext.Provider, {
+        value: {
+            serwist
+        },
+        children: children
+    });
+}
+
+export { SerwistProvider, useSerwist };

package/dist/lib/config/types.d.ts

@@ -0,0 +1,11 @@
+import type { BuildOptions } from "@serwist/cli";
+import type { Optional } from "@serwist/utils";
+export interface SerwistOptions extends Optional<BuildOptions, "globDirectory"> {
+    /**
+     * Whether Serwist should precache prerendered routes.
+     *
+     * @default true
+     */
+    precachePrerendered?: boolean;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/lib/config/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAe,SAAQ,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IAC7E;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}

package/dist/lib/config/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const generateGlobPatterns: (distDir: string) => string[];
+//# sourceMappingURL=utils.d.ts.map

package/dist/lib/config/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC"}

package/dist/lib/context.d.ts

@@ -0,0 +1,7 @@
+import type { Serwist } from "@serwist/window";
+export interface SerwistContextValues {
+    serwist: Serwist | null;
+}
+export declare const SerwistContext: import("react").Context<SerwistContextValues>;
+export declare const useSerwist: () => SerwistContextValues;
+//# sourceMappingURL=context.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/lib/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB;AAED,eAAO,MAAM,cAAc,+CAA6C,CAAC;AAEzE,eAAO,MAAM,UAAU,4BAMtB,CAAC"}

package/dist/lib/logger.d.ts

@@ -1,3 +1,4 @@
+export type LoggingMethods = "wait" | "error" | "warn" | "info" | "event";
 export declare const wait: (...message: any[]) => void;
 export declare const error: (...message: any[]) => void;
 export declare const warn: (...message: any[]) => void;

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,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"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAyC1E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAAqC,CAAC;AAE7E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAAqC,CAAC"}

package/dist/lib/schema.d.ts

@@ -9,22 +9,6 @@ export declare const injectPartial: 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>>;
@@ -86,5 +70,21 @@ export declare const injectManifestOptions: z.ZodObject<{
     }, z.core.$strict>>>>>>;
     maximumFileSizeToCacheInBytes: z.ZodDefault<z.ZodNumber>;
     modifyURLPrefix: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    injectionPoint: z.ZodDefault<z.ZodString>;
+    swSrc: z.ZodString;
+    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>>;
+    compileSrc: z.ZodDefault<z.ZodBoolean>;
+    webpackCompilationPlugins: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    chunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    exclude: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
+    excludeChunks: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    include: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodCustom<RegExp, RegExp>, z.ZodPipe<z.ZodCustom<z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>, z.ZodTransform<(args_0: any) => boolean, z.core.$InferInnerFunctionType<z.ZodTuple<[z.ZodAny], null>, z.ZodBoolean>>>]>>>;
 }, z.core.$strict>;
 //# sourceMappingURL=schema.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.2.3",
+  "version": "9.3.1",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -32,14 +32,20 @@
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
-      "worker": [
-        "./dist/index.worker.d.ts"
+      "config": [
+        "./dist/index.config.d.ts"
       ],
-      "typings": [
-        "./dist/sw-entry.d.ts"
+      "react": [
+        "./dist/index.react.d.ts"
       ],
       "schema": [
         "./dist/index.schema.d.ts"
+      ],
+      "typings": [
+        "./dist/sw-entry.d.ts"
+      ],
+      "worker": [
+        "./dist/index.worker.d.ts"
       ]
     }
   },
@@ -48,45 +54,62 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./worker": {
-      "types": "./dist/index.worker.d.ts",
-      "default": "./dist/index.worker.js"
+    "./config": {
+      "types": "./dist/index.config.d.ts",
+      "default": "./dist/index.config.js"
     },
-    "./typings": {
-      "types": "./dist/sw-entry.d.ts"
+    "./react": {
+      "types": "./dist/index.react.d.ts",
+      "default": "./dist/index.react.js"
     },
     "./schema": {
       "types": "./dist/index.schema.d.ts",
       "default": "./dist/index.schema.js"
     },
+    "./typings": {
+      "types": "./dist/sw-entry.d.ts"
+    },
+    "./worker": {
+      "types": "./dist/index.worker.d.ts",
+      "default": "./dist/index.worker.js"
+    },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "chalk": "5.6.2",
     "glob": "10.5.0",
-    "zod": "4.1.12",
-    "@serwist/build": "9.2.3",
-    "@serwist/webpack-plugin": "9.2.3",
-    "@serwist/window": "9.2.3",
-    "serwist": "9.2.3"
+    "kolorist": "1.8.0",
+    "semver": "7.7.3",
+    "zod": "4.2.1",
+    "@serwist/build": "9.3.1",
+    "@serwist/webpack-plugin": "9.3.1",
+    "@serwist/window": "9.3.1",
+    "serwist": "9.3.1"
   },
   "devDependencies": {
-    "@types/node": "24.10.1",
-    "next": "16.0.3",
-    "react": "19.2.0",
-    "react-dom": "19.2.0",
-    "rollup": "4.53.3",
-    "type-fest": "5.2.0",
+    "@types/node": "25.0.3",
+    "@types/react": "19.2.7",
+    "@types/semver": "7.7.1",
+    "next": "16.1.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "rollup": "4.54.0",
+    "type-fest": "5.3.1",
     "typescript": "5.9.3",
-    "webpack": "5.103.0",
-    "@serwist/configs": "9.2.3",
-    "@serwist/utils": "9.2.3"
+    "webpack": "5.104.1",
+    "@serwist/cli": "9.3.1",
+    "@serwist/configs": "9.3.1",
+    "@serwist/utils": "9.3.1"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
-    "typescript": ">=5.0.0"
+    "react": ">=18.0.0",
+    "typescript": ">=5.0.0",
+    "@serwist/cli": "9.3.1"
   },
   "peerDependenciesMeta": {
+    "@serwist/cli": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }

package/src/index.config.ts

@@ -0,0 +1,91 @@
+import fs from "node:fs";
+import path from "node:path";
+import { rebasePath } from "@serwist/build";
+import type { BuildOptions } from "@serwist/cli";
+import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "next/constants.js";
+import type { SerwistOptions } from "./lib/config/types.js";
+import { generateGlobPatterns } from "./lib/config/utils.js";
+
+import loadNextConfig = require("next/dist/server/config.js");
+
+export const serwist = async (options: SerwistOptions): Promise<BuildOptions> => {
+  const isWatch = process.env.SERWIST_ENV === "watch";
+  const nextPhase = isWatch ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
+  const config = await loadNextConfig.default(nextPhase, process.cwd(), {
+    silent: false,
+  });
+  const basePath = config.basePath || "/";
+  let distDir = config.distDir;
+  if (distDir[0] === "/") distDir = distDir.slice(1);
+  if (distDir[distDir.length - 1] !== "/") distDir += "/";
+  const distServerDir = `${distDir}server/`;
+  const distAppDir = `${distServerDir}app/`;
+  const distPagesDir = `${distServerDir}pages/`;
+  const { precachePrerendered = true, globDirectory = process.cwd(), ...cliOptions } = options;
+  for (const file of [cliOptions.swDest, `${cliOptions.swDest}.map`]) {
+    fs.rmSync(file, { force: true });
+  }
+  return {
+    dontCacheBustURLsMatching: new RegExp(`^${distDir}static/`),
+    disablePrecacheManifest: isWatch,
+    ...cliOptions,
+    globDirectory,
+    globPatterns: [
+      ...(cliOptions.globPatterns ?? generateGlobPatterns(distDir)),
+      ...(precachePrerendered ? [`${distServerDir}{app,pages}/**/*.html`] : []),
+    ],
+    globIgnores: [
+      `${distAppDir}**/_not-found.html`,
+      `${distPagesDir}404.html`,
+      `${distPagesDir}500.html`,
+      ...(cliOptions.globIgnores ?? []),
+      rebasePath({ baseDirectory: globDirectory, file: cliOptions.swSrc }),
+      rebasePath({ baseDirectory: globDirectory, file: cliOptions.swDest }),
+      rebasePath({ baseDirectory: globDirectory, file: `${cliOptions.swDest}.map` }),
+    ],
+    manifestTransforms: [
+      ...(cliOptions.manifestTransforms ?? []),
+      (manifestEntries) => {
+        const manifest = manifestEntries.map((m) => {
+          if (m.url.startsWith(distAppDir)) {
+            // Keep the prefixing slash.
+            m.url = m.url.slice(distAppDir.length - 1);
+          }
+          if (m.url.startsWith(distPagesDir)) {
+            // Keep the prefixing slash.
+            m.url = m.url.slice(distPagesDir.length - 1);
+          }
+          if (m.url.endsWith(".html")) {
+            // trailingSlash: true && output: 'export'
+            // or root index.html.
+            // https://nextjs.org/docs/app/api-reference/config/next-config-js/trailingSlash
+            // "/abc/index.html" -> "/abc/"
+            // "/index.html" -> "/"
+            if (m.url.endsWith("/index.html")) {
+              m.url = m.url.slice(0, m.url.lastIndexOf("/") + 1);
+            }
+            // "/xxx.html" -> "/xxx"
+            else {
+              m.url = m.url.substring(0, m.url.lastIndexOf("."));
+            }
+            m.url = path.posix.join(basePath, m.url);
+          }
+          // Replace all references to "$(distDir)" with "$(assetPrefix)/_next/".
+          if (m.url.startsWith(distDir)) {
+            m.url = `${config.assetPrefix ?? ""}/_next/${m.url.slice(distDir.length)}`;
+          }
+          // Replace all references to public/ with "$(basePath)/".
+          if (m.url.startsWith("public/")) {
+            m.url = path.posix.join(basePath, m.url.slice(7));
+          }
+          return m;
+        });
+        return { manifest, warnings: [] };
+      },
+    ],
+  };
+};
+
+export { generateGlobPatterns };
+
+export type { SerwistOptions };

package/src/index.react.tsx

@@ -0,0 +1,86 @@
+import { Serwist } from "@serwist/window";
+import { isCurrentPageOutOfScope } from "@serwist/window/internal";
+import { type ReactNode, useEffect, useState } from "react";
+import { SerwistContext, useSerwist } from "./lib/context.js";
+
+export interface SerwistProviderProps {
+  swUrl: string;
+  register?: boolean;
+  cacheOnNavigation?: boolean;
+  reloadOnOnline?: boolean;
+  options?: RegistrationOptions;
+  children?: ReactNode;
+}
+
+declare global {
+  interface Window {
+    serwist: Serwist;
+  }
+}
+
+export function SerwistProvider({
+  swUrl,
+  register = true,
+  cacheOnNavigation = true,
+  reloadOnOnline = true,
+  options,
+  children,
+}: SerwistProviderProps) {
+  const [serwist] = useState(() => {
+    if (typeof window === "undefined") return null;
+    if (!(window.serwist && window.serwist instanceof Serwist) && "serviceWorker" in navigator) {
+      window.serwist = new Serwist(swUrl, { ...options, type: options?.type || "module", scope: options?.scope || "/" });
+    }
+    return window.serwist ?? null;
+  });
+  useEffect(() => {
+    const scope = options?.scope || "/";
+    if (register && !isCurrentPageOutOfScope(scope)) {
+      void serwist?.register();
+    }
+  }, [register, options?.scope, serwist?.register]);
+  useEffect(() => {
+    const cacheUrls = async (url?: string | URL | null | undefined) => {
+      if (!window.navigator.onLine || !url) {
+        return;
+      }
+      serwist?.messageSW({
+        type: "CACHE_URLS",
+        payload: { urlsToCache: [url] },
+      });
+    };
+    const cacheCurrentPathname = () => cacheUrls(window.location.pathname);
+    const pushState = history.pushState;
+    const replaceState = history.replaceState;
+
+    if (cacheOnNavigation) {
+      history.pushState = (...args) => {
+        pushState.apply(history, args);
+        cacheUrls(args[2]);
+      };
+      history.replaceState = (...args) => {
+        replaceState.apply(history, args);
+        cacheUrls(args[2]);
+      };
+      window.addEventListener("online", cacheCurrentPathname);
+    }
+
+    return () => {
+      history.pushState = pushState;
+      history.replaceState = replaceState;
+      window.removeEventListener("online", cacheCurrentPathname);
+    };
+  }, [serwist?.messageSW, cacheOnNavigation]);
+  useEffect(() => {
+    const reload = () => location.reload();
+    if (reloadOnOnline) {
+      window.addEventListener("online", reload);
+    }
+    return () => {
+      window.removeEventListener("online", reload);
+    };
+  }, [reloadOnOnline]);
+  return <SerwistContext.Provider value={{ serwist }}>{children}</SerwistContext.Provider>;
+}
+
+export { useSerwist };

package/src/index.ts

@@ -24,7 +24,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
   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.`,
+      `[@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 = {}) => ({
@@ -141,9 +141,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
         });
 
         for (const file of cleanUpList) {
-          fs.rm(file, { force: true }, (err) => {
-            if (err) throw err;
-          });
+          fs.rmSync(file, { force: true });
         }
 
         const shouldBuildSWEntryWorker = cacheOnNavigation;
@@ -214,7 +212,6 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
               },
             ],
             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.

package/src/lib/config/types.ts

@@ -0,0 +1,11 @@
+import type { BuildOptions } from "@serwist/cli";
+import type { Optional } from "@serwist/utils";
+
+export interface SerwistOptions extends Optional<BuildOptions, "globDirectory"> {
+  /**
+   * Whether Serwist should precache prerendered routes.
+   *
+   * @default true
+   */
+  precachePrerendered?: boolean;
+}

package/src/lib/config/utils.ts

@@ -0,0 +1,4 @@
+export const generateGlobPatterns = (distDir: string) => [
+  `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
+  "public/**/*",
+];

package/src/lib/context.ts

@@ -0,0 +1,16 @@
+import type { Serwist } from "@serwist/window";
+import { createContext, useContext } from "react";
+
+export interface SerwistContextValues {
+  serwist: Serwist | null;
+}
+
+export const SerwistContext = createContext<SerwistContextValues>(null!);
+
+export const useSerwist = () => {
+  const context = useContext(SerwistContext);
+  if (!context) {
+    throw new Error("[useSerwist]: 'SerwistContext' is not available.");
+  }
+  return context;
+};

package/src/lib/logger.ts

@@ -1,28 +1,39 @@
-import chalk from "chalk";
+import { createRequire } from "node:module";
+import { bold, green, red, white, yellow } from "kolorist";
+import semver from "semver";
 
-const LOGGING_METHOD = ["wait", "error", "warn", "info", "event"] as const;
+const require = createRequire(import.meta.url);
 
-type LoggingMethods = (typeof LOGGING_METHOD)[number];
+const LOGGING_SPACE_PREFIX = semver.gte(require("next/package.json").version, "16.0.0") ? "" : " ";
 
-const mapLoggingMethodToConsole: Record<LoggingMethods, "log" | "error" | "warn" | "log"> = {
-  wait: "log",
-  error: "error",
-  warn: "warn",
-  info: "log",
-  event: "log",
-};
-
-const prefixes = {
-  wait: `${chalk.white(chalk.bold("○"))} (serwist)`,
-  error: `${chalk.red(chalk.bold("X"))} (serwist)`,
-  warn: `${chalk.yellow(chalk.bold("⚠"))} (serwist)`,
-  info: `${chalk.white(chalk.bold("○"))} (serwist)`,
-  event: `${chalk.green(chalk.bold("✓"))} (serwist)`,
-};
+export type LoggingMethods = "wait" | "error" | "warn" | "info" | "event";
 
 const prefixedLog = (prefixType: LoggingMethods, ...message: any[]) => {
-  const consoleMethod = mapLoggingMethodToConsole[prefixType];
-  const prefix = prefixes[prefixType];
+  let prefix: string;
+  let consoleMethod: keyof Console;
+
+  switch (prefixType) {
+    case "wait":
+      prefix = `${white(bold("○"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+    case "error":
+      prefix = `${red(bold("X"))} (serwist)`;
+      consoleMethod = "error";
+      break;
+    case "warn":
+      prefix = `${yellow(bold("⚠"))} (serwist)`;
+      consoleMethod = "warn";
+      break;
+    case "info":
+      prefix = `${white(bold("○"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+    case "event":
+      prefix = `${green(bold("✓"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+  }
 
   if ((message[0] === "" || message[0] === undefined) && message.length === 1) {
     message.shift();
@@ -32,26 +43,16 @@ const prefixedLog = (prefixType: LoggingMethods, ...message: any[]) => {
   if (message.length === 0) {
     console[consoleMethod]("");
   } else {
-    console[consoleMethod](` ${prefix}`, ...message);
+    console[consoleMethod](`${LOGGING_SPACE_PREFIX}${prefix}`, ...message);
   }
 };
 
-export const wait = (...message: any[]) => {
-  prefixedLog("wait", ...message);
-};
+export const wait = (...message: any[]) => prefixedLog("wait", ...message);
 
-export const error = (...message: any[]) => {
-  prefixedLog("error", ...message);
-};
+export const error = (...message: any[]) => prefixedLog("error", ...message);
 
-export const warn = (...message: any[]) => {
-  prefixedLog("warn", ...message);
-};
+export const warn = (...message: any[]) => prefixedLog("warn", ...message);
 
-export const info = (...message: any[]) => {
-  prefixedLog("info", ...message);
-};
+export const info = (...message: any[]) => prefixedLog("info", ...message);
 
-export const event = (...message: any[]) => {
-  prefixedLog("event", ...message);
-};
+export const event = (...message: any[]) => prefixedLog("event", ...message);