@serwist/next 9.4.3 → 9.5.0

package/dist/index.config.d.ts

@@ -1,7 +1,36 @@
 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";
-export declare const serwist: (options: SerwistOptions) => Promise<BuildOptions>;
+/**
+ * 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 +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,EAAoB,MAAM,uBAAuB,CAAC;AAI/E,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,YAAY,CAiF3E,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,YAAY,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"index.config.d.ts","sourceRoot":"","sources":["../src/index.config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAoC,MAAM,uBAAuB,CAAC;AAK/F;;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,OA4ErB,CAAC;AAOF,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,YAAY,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.config.js

@@ -1,9 +1,9 @@
-import { createRequire } from 'module';
 import fs from 'node:fs';
 import path from 'node:path';
 import { rebasePath } from '@serwist/build';
-import { MODERN_BROWSERSLIST_TARGET, PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from 'next/constants.js';
+import { createRequire } from 'module';
 import browserslist from 'browserslist';
+import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD, MODERN_BROWSERSLIST_TARGET } from 'next/constants.js';
 
 const SUPPORTED_ESBUILD_TARGETS = [
     "chrome",
@@ -24,6 +24,14 @@ const UNSUPPORTED_BROWSERLIST_TARGETS = [
     "android 2"
 ];
 
+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/**/*"
@@ -76,17 +84,12 @@ const loadBrowserslist = (cwd)=>{
     }, []).map((split)=>split.join(""));
 };
 
-const __require = createRequire(import.meta.url);
-const loadNextConfig = __require("next/dist/server/config.js");
-const serwist = async (options)=>{
-    const cwd = process.cwd();
-    const isDev = process.env.NODE_ENV === "development";
-    const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
-    const config = await loadNextConfig.default(nextPhase, cwd, {
-        silent: false
-    });
-    const basePath = config.basePath || "/";
-    let distDir = config.distDir;
+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/`;
@@ -149,7 +152,7 @@ const serwist = async (options)=>{
                         m.url = path.posix.join(basePath, m.url);
                     }
                     if (m.url.startsWith(distDir)) {
-                        m.url = `${config.assetPrefix ?? ""}/_next/${m.url.slice(distDir.length)}`;
+                        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));
@@ -168,5 +171,12 @@ const serwist = async (options)=>{
         }
     };
 };
+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/lib/config/utils.d.ts

@@ -1,3 +1,4 @@
+export declare const loadNextConfig: (cwd: string, isDev: boolean) => Promise<import("next/dist/server/config-shared.js").NextConfigComplete>;
 export declare const generateGlobPatterns: (distDir: string) => string[];
 /**
  * Loads and converts Browserslist into esbuild's `target` option.

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC;AAmBF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,MAAM,EAqDpD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,EAAE,OAAO,OAAO,4EAKzD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC;AAmBF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,MAAM,EAqDpD,CAAC"}

package/dist/lib/schema.d.ts

@@ -41,7 +41,7 @@ export declare const injectManifestOptions: z.ZodObject<{
             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<{
+    }, z.core.$strict>>>, z.ZodTransform<z.core.$InferOuterFunctionTypeAsync<z.ZodTuple<[z.ZodArray<z.ZodObject<{
         size: z.ZodNumber;
         integrity: z.ZodOptional<z.ZodString>;
         revision: z.ZodOptional<z.ZodNullable<z.ZodString>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.4.3",
+  "version": "9.5.0",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -80,32 +80,32 @@
     "glob": "10.5.0",
     "kolorist": "1.8.0",
     "semver": "7.7.3",
-    "zod": "4.2.1",
-    "@serwist/build": "9.4.3",
-    "@serwist/utils": "9.4.3",
-    "@serwist/webpack-plugin": "9.4.3",
-    "@serwist/window": "9.4.3",
-    "serwist": "9.4.3"
+    "zod": "4.3.5",
+    "@serwist/build": "9.5.0",
+    "@serwist/utils": "9.5.0",
+    "@serwist/webpack-plugin": "9.5.0",
+    "@serwist/window": "9.5.0",
+    "serwist": "9.5.0"
   },
   "devDependencies": {
     "@types/node": "25.0.3",
     "@types/react": "19.2.7",
     "@types/semver": "7.7.1",
-    "next": "16.1.0",
+    "next": "16.1.1",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "rollup": "4.54.0",
+    "rollup": "4.55.1",
     "type-fest": "5.3.1",
     "typescript": "5.9.3",
     "webpack": "5.104.1",
-    "@serwist/cli": "9.4.3",
-    "@serwist/configs": "9.4.3"
+    "@serwist/cli": "9.5.0",
+    "@serwist/configs": "9.5.0"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "react": ">=18.0.0",
     "typescript": ">=5.0.0",
-    "@serwist/cli": "^9.4.3"
+    "@serwist/cli": "^9.5.0"
   },
   "peerDependenciesMeta": {
     "@serwist/cli": {

package/src/index.config.ts

@@ -2,21 +2,50 @@ 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 { NextConfigComplete } from "next/dist/server/config-shared.js";
 import type { SerwistOptions } from "./lib/config/types.js";
-import { generateGlobPatterns, loadBrowserslist } from "./lib/config/utils.js";
+import { generateGlobPatterns, loadBrowserslist, loadNextConfig } from "./lib/config/utils.js";
 
-import loadNextConfig = require("next/dist/server/config.js");
+const _cwd = process.cwd();
+const _isDev = process.env.NODE_ENV === "development";
 
-export const serwist = async (options: SerwistOptions): Promise<BuildOptions> => {
-  const cwd = process.cwd();
-  const isDev = process.env.NODE_ENV === "development";
-  const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
-  const config = await loadNextConfig.default(nextPhase, cwd, {
-    silent: false,
-  });
-  const basePath = config.basePath || "/";
-  let distDir = config.distDir;
+/**
+ * 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 const serwist: 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/`;
@@ -73,7 +102,7 @@ export const serwist = async (options: SerwistOptions): Promise<BuildOptions> =>
           }
           // Replace all references to "$(distDir)" with "$(assetPrefix)/_next/".
           if (m.url.startsWith(distDir)) {
-            m.url = `${config.assetPrefix ?? ""}/_next/${m.url.slice(distDir.length)}`;
+            m.url = `${nextConfig.assetPrefix ?? ""}/_next/${m.url.slice(distDir.length)}`;
           }
           // Replace all references to public/ with "$(basePath)/".
           if (m.url.startsWith("public/")) {
@@ -91,6 +120,11 @@ export const serwist = async (options: SerwistOptions): Promise<BuildOptions> =>
   };
 };
 
+serwist.withNextConfig = async (optionsFunction, { cwd = _cwd, isDev = _isDev } = {}) => {
+  const nextConfig = await loadNextConfig(cwd, isDev);
+  return serwist(await optionsFunction(nextConfig), nextConfig, { cwd, isDev });
+};
+
 export { generateGlobPatterns };
 
 export type { SerwistOptions };

package/src/lib/config/utils.ts

@@ -1,7 +1,16 @@
 import browserslist from "browserslist";
-import { MODERN_BROWSERSLIST_TARGET } from "next/constants.js";
+import { MODERN_BROWSERSLIST_TARGET, PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "next/constants.js";
 import { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS } from "./constants.js";
 
+import nextConfig = require("next/dist/server/config.js");
+
+export const loadNextConfig = (cwd: string, isDev: boolean) => {
+  const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
+  return nextConfig.default(nextPhase, cwd, {
+    silent: false,
+  });
+};
+
 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/**/*",