@serwist/next 9.5.7 → 9.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.5.7",
+  "version": "9.5.8",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -28,84 +28,83 @@
   "repository": "https://github.com/serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "typesVersions": {
     "*": {
       "config": [
-        "./dist/index.config.d.ts"
+        "./dist/index.config.d.mts"
       ],
       "react": [
-        "./dist/index.react.d.ts"
+        "./dist/index.react.d.mts"
       ],
       "schema": [
-        "./dist/index.schema.d.ts"
+        "./dist/index.schema.d.mts"
       ],
       "typings": [
-        "./dist/sw-entry.d.ts"
+        "./dist/sw-entry.d.mts"
       ],
       "worker": [
-        "./dist/index.worker.d.ts"
+        "./dist/index.worker.d.mts"
       ]
     }
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
     },
     "./config": {
-      "types": "./dist/index.config.d.ts",
-      "default": "./dist/index.config.js"
+      "types": "./dist/index.config.d.mts",
+      "default": "./dist/index.config.mjs"
     },
     "./react": {
-      "types": "./dist/index.react.d.ts",
-      "default": "./dist/index.react.js"
+      "types": "./dist/index.react.d.mts",
+      "default": "./dist/index.react.mjs"
     },
     "./schema": {
-      "types": "./dist/index.schema.d.ts",
-      "default": "./dist/index.schema.js"
+      "types": "./dist/index.schema.d.mts",
+      "default": "./dist/index.schema.mjs"
     },
     "./typings": {
-      "types": "./dist/sw-entry.d.ts"
+      "types": "./dist/sw-entry.d.mts"
     },
     "./worker": {
-      "types": "./dist/index.worker.d.ts",
-      "default": "./dist/index.worker.js"
+      "types": "./dist/index.worker.d.mts",
+      "default": "./dist/index.worker.mjs"
     },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "browserslist": "4.28.1",
+    "browserslist": "4.28.2",
     "glob": "10.5.0",
     "kolorist": "1.8.0",
     "semver": "7.7.4",
     "zod": "4.3.6",
-    "@serwist/build": "9.5.7",
-    "@serwist/utils": "9.5.7",
-    "@serwist/webpack-plugin": "9.5.7",
-    "@serwist/window": "9.5.7",
-    "serwist": "9.5.7"
+    "@serwist/build": "9.5.8",
+    "@serwist/utils": "9.5.8",
+    "@serwist/webpack-plugin": "9.5.8",
+    "@serwist/window": "9.5.8",
+    "serwist": "9.5.8"
   },
   "devDependencies": {
-    "@types/node": "25.5.0",
+    "@types/node": "25.6.0",
     "@types/react": "19.2.14",
     "@types/semver": "7.7.1",
-    "next": "16.1.6",
-    "react": "19.2.4",
-    "react-dom": "19.2.4",
-    "rollup": "4.59.0",
-    "type-fest": "5.4.4",
-    "typescript": "5.9.3",
-    "webpack": "5.105.4",
-    "@serwist/cli": "9.5.7",
-    "@serwist/configs": "9.5.7"
+    "next": "16.2.4",
+    "react": "19.2.5",
+    "react-dom": "19.2.5",
+    "tsdown": "^0.21.10",
+    "type-fest": "5.6.0",
+    "typescript": "6.0.3",
+    "webpack": "5.106.2",
+    "@serwist/cli": "9.5.8"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "react": ">=18.0.0",
     "typescript": ">=5.0.0",
-    "@serwist/cli": "^9.5.7"
+    "@serwist/cli": "^9.5.8"
   },
   "peerDependenciesMeta": {
     "@serwist/cli": {
@@ -116,8 +115,8 @@
     }
   },
   "scripts": {
-    "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
-    "dev": "rollup --config rollup.config.js --watch",
+    "build": "rimraf dist && NODE_ENV=production tsdown",
+    "dev": "tsdown --watch",
     "lint": "biome lint ./src",
     "typecheck": "tsc"
   }

package/src/index.react.tsx

@@ -1,6 +1,6 @@
 import { Serwist } from "@serwist/window";
 import { isCurrentPageOutOfScope } from "@serwist/window/internal";
-import { type ReactNode, useEffect, useState } from "react";
+import { type JSX, type ReactNode, useEffect, useState } from "react";
 import { SerwistContext, useSerwist } from "./lib/context.js";
 
 export interface SerwistProviderProps {
@@ -32,7 +32,7 @@ export function SerwistProvider({
   reloadOnOnline = true,
   options,
   children,
-}: SerwistProviderProps) {
+}: SerwistProviderProps): JSX.Element {
   const [serwist] = useState(() => {
     if (typeof window === "undefined") return null;
     if (disable) return null;

package/src/index.ts

@@ -82,7 +82,7 @@ Follow https://github.com/serwist/serwist/issues/54 for progress on Serwist + Tu
         } satisfies Record<`${SerwistNextOptionsKey}.${Exclude<keyof SerwistNextOptions, "swEntryWorker">}`, string | undefined>),
       );
 
-      const swEntryJs = path.join(dirname, "sw-entry.js");
+      const swEntryJs = path.join(dirname, "sw-entry.mjs");
       const entry = config.entry as () => Promise<Record<string, string[] | string>>;
       config.entry = async () => {
         const entries = await entry();
@@ -157,7 +157,7 @@ Follow https://github.com/serwist/serwist/issues/54 for progress on Serwist + Tu
         let swEntryWorkerDest: string | undefined;
 
         if (shouldBuildSWEntryWorker) {
-          const swEntryWorkerSrc = path.join(dirname, "sw-entry-worker.js");
+          const swEntryWorkerSrc = path.join(dirname, "sw-entry-worker.mjs");
           const swEntryName = `swe-worker-${getContentHash(swEntryWorkerSrc, dev)}.js`;
           swEntryPublicPath = path.posix.join(basePath, swEntryName);
           swEntryWorkerDest = path.join(destDir, swEntryName);

package/src/lib/config/utils.ts

@@ -1,15 +1,16 @@
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "next/constants.js";
+import type { NextConfigComplete } from "next/dist/server/config-shared.js";
 
 import nextConfig = require("next/dist/server/config.js");
 
-export const loadNextConfig = (cwd: string, isDev: boolean) => {
+export const loadNextConfig = (cwd: string, isDev: boolean): Promise<NextConfigComplete> => {
   const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
   return nextConfig.default(nextPhase, cwd, {
     silent: false,
   });
 };
 
-export const generateGlobPatterns = (distDir: string) => [
+export const generateGlobPatterns = (distDir: string): string[] => [
   `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
   "public/**/*",
 ];

package/dist/chunks/schema.js

@@ -1,24 +0,0 @@
-import { requiredSwDestPartial } from '@serwist/build/schema';
-import { injectManifestOptions as injectManifestOptions$1 } from '@serwist/webpack-plugin/schema';
-import { z } from 'zod';
-
-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([
-        "**/*"
-    ])
-});
-const injectManifestOptions = z.strictObject({
-    ...injectManifestOptions$1.shape,
-    ...requiredSwDestPartial.shape,
-    ...injectPartial.shape
-}).omit({
-    disablePrecacheManifest: true
-});
-
-export { injectPartial as a, injectManifestOptions as i };

package/dist/index.config.d.ts

@@ -1,36 +0,0 @@
-import type { BuildOptions } from "@serwist/cli";
-import type { NextConfigComplete } from "next/dist/server/config-shared.js";
-import type { SerwistOptions } from "./lib/config/types.js";
-import { generateGlobPatterns } from "./lib/config/utils.js";
-/**
- * Additional build context.
- */
-export interface SerwistContext {
-    /**
-     * The current working directory.
-     */
-    cwd?: string;
-    /**
-     * Whether Serwist is in development mode. This option determines how Next.js configuration
-     * is resolved. Note that it doesn't change how the service worker is built.
-     */
-    isDev?: boolean;
-}
-export interface Serwist {
-    /**
-     * Integrates Serwist into your Next.js app.
-     * @param options
-     * @returns
-     */
-    (options: SerwistOptions, nextConfig?: NextConfigComplete, context?: SerwistContext): Promise<BuildOptions>;
-    /**
-     * Integrates Serwist into your Next.js app. Allows reading fully resolved Next.js configuration.
-     * @param optionsFunction
-     * @returns
-     */
-    withNextConfig: (optionsFunction: (nextConfig: NextConfigComplete) => Promise<SerwistOptions> | SerwistOptions, context?: SerwistContext) => Promise<BuildOptions>;
-}
-export declare const serwist: Serwist;
-export { generateGlobPatterns };
-export type { SerwistOptions };
-//# sourceMappingURL=index.config.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.config.d.ts","sourceRoot":"","sources":["../src/index.config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAIjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAkB,MAAM,uBAAuB,CAAC;AAK7E;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB;;;;OAIG;IACH,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5G;;;;OAIG;IACH,cAAc,EAAE,CACd,eAAe,EAAE,CAAC,UAAU,EAAE,kBAAkB,KAAK,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,EAC7F,OAAO,CAAC,EAAE,cAAc,KACrB,OAAO,CAAC,YAAY,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,OAAO,EAAE,OA6ErB,CAAC;AAOF,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,YAAY,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.config.js

@@ -1,118 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { rebasePath } from '@serwist/build';
-import { browserslistToEsbuild } from '@serwist/utils';
-import browserslist from 'browserslist';
-import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD, MODERN_BROWSERSLIST_TARGET } from 'next/constants.js';
-import { createRequire } from 'module';
-
-const __require = createRequire(import.meta.url);
-const nextConfig = __require("next/dist/server/config.js");
-const loadNextConfig = (cwd, isDev)=>{
-    const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
-    return nextConfig.default(nextPhase, cwd, {
-        silent: false
-    });
-};
-const generateGlobPatterns = (distDir)=>[
-        `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
-        "public/**/*"
-    ];
-
-const _cwd = process.cwd();
-const _isDev = process.env.NODE_ENV === "development";
-const serwist = async (options, nextConfig, { cwd = _cwd, isDev = _isDev } = {})=>{
-    if (!nextConfig) nextConfig = await loadNextConfig(cwd, isDev);
-    const basePath = nextConfig.basePath || "/";
-    let distDir = nextConfig.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 = cwd, ...cliOptions } = options;
-    for (const file of [
-        cliOptions.swDest,
-        `${cliOptions.swDest}.map`
-    ]){
-        fs.rmSync(file, {
-            force: true
-        });
-    }
-    return {
-        dontCacheBustURLsMatching: new RegExp(`^${distDir}static/`),
-        disablePrecacheManifest: isDev,
-        ...cliOptions,
-        globDirectory,
-        globPatterns: [
-            ...cliOptions.globPatterns ?? generateGlobPatterns(distDir),
-            ...precachePrerendered ? [
-                `${distServerDir}{app,pages}/**/*.html`
-            ] : []
-        ],
-        globIgnores: [
-            `${distAppDir}**/_not-found.html`,
-            `${distAppDir}_global-error*`,
-            `${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 = `${nextConfig.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: []
-                };
-            }
-        ],
-        esbuildOptions: {
-            ...cliOptions.esbuildOptions,
-            target: cliOptions.esbuildOptions?.target ?? browserslistToEsbuild(browserslist, cwd, MODERN_BROWSERSLIST_TARGET)
-        }
-    };
-};
-serwist.withNextConfig = async (optionsFunction, { cwd = _cwd, isDev = _isDev } = {})=>{
-    const nextConfig = await loadNextConfig(cwd, isDev);
-    return serwist(await optionsFunction(nextConfig), nextConfig, {
-        cwd,
-        isDev
-    });
-};
-
-export { generateGlobPatterns, serwist };

package/dist/index.d.ts

@@ -1,13 +0,0 @@
-import type { NextConfig } from "next";
-import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./lib/types.js";
-import { validateInjectManifestOptions } from "./lib/validator.js";
-/**
- * Integrates Serwist into your Next.js app.
- * @param userOptions
- * @returns
- */
-declare const withSerwistInit: (userOptions: InjectManifestOptions) => ((nextConfig?: NextConfig) => NextConfig);
-export default withSerwistInit;
-export { validateInjectManifestOptions };
-export type { InjectManifestOptions as PluginOptions, InjectManifestOptionsComplete as PluginOptionsComplete };
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"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,GAAI,aAAa,qBAAqB,KAAG,CAAC,CAAC,UAAU,CAAC,EAAE,UAAU,KAAK,UAAU,CAuOrG,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}