@serwist/next 9.4.2 → 9.4.4

package/dist/index.config.d.ts

@@ -1,7 +1,16 @@
 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>;
+/**
+ * Integrates Serwist into your Next.js app.
+ * @param options
+ * @returns
+ */
+export declare const serwist: {
+    (options: SerwistOptions, nextConfig?: NextConfigComplete): Promise<BuildOptions>;
+    withNextConfig(optionsFunction: (nextConfig: NextConfigComplete) => Promise<SerwistOptions> | SerwistOptions): Promise<BuildOptions>;
+};
 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;AAE/F;;;;GAIG;AACH,eAAO,MAAM,OAAO;cAAmB,cAAc,eAAe,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;oCAsF3F,CAAC,UAAU,EAAE,kBAAkB,KAAK,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,GAC5F,OAAO,CAAC,YAAY,CAAC;CATvB,CAAC;AAgBF,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 serwist = async (options, nextConfig)=>{
     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;
+    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,11 @@ const serwist = async (options)=>{
         }
     };
 };
+serwist.withNextConfig = async (optionsFunction)=>{
+    const cwd = process.cwd();
+    const isDev = process.env.NODE_ENV === "development";
+    const nextConfig = await loadNextConfig(cwd, isDev);
+    return serwist(await optionsFunction(nextConfig), nextConfig);
+};
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.4.2",
+  "version": "9.4.4",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -81,10 +81,11 @@
     "kolorist": "1.8.0",
     "semver": "7.7.3",
     "zod": "4.2.1",
-    "@serwist/build": "9.4.2",
-    "@serwist/webpack-plugin": "9.4.2",
-    "@serwist/window": "9.4.2",
-    "serwist": "9.4.2"
+    "@serwist/build": "9.4.4",
+    "@serwist/utils": "9.4.4",
+    "@serwist/webpack-plugin": "9.4.4",
+    "@serwist/window": "9.4.4",
+    "serwist": "9.4.4"
   },
   "devDependencies": {
     "@types/node": "25.0.3",
@@ -97,15 +98,14 @@
     "type-fest": "5.3.1",
     "typescript": "5.9.3",
     "webpack": "5.104.1",
-    "@serwist/cli": "9.4.2",
-    "@serwist/configs": "9.4.2",
-    "@serwist/utils": "9.4.2"
+    "@serwist/configs": "9.4.4",
+    "@serwist/cli": "9.4.4"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "react": ">=18.0.0",
     "typescript": ">=5.0.0",
-    "@serwist/cli": "^9.4.2"
+    "@serwist/cli": "^9.4.4"
   },
   "peerDependenciesMeta": {
     "@serwist/cli": {

package/src/index.config.ts

@@ -2,21 +2,21 @@ 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");
-
-export const serwist = async (options: SerwistOptions): Promise<BuildOptions> => {
+/**
+ * Integrates Serwist into your Next.js app.
+ * @param options
+ * @returns
+ */
+export const serwist = async (options: SerwistOptions, nextConfig?: NextConfigComplete): 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;
+  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 +73,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 +91,20 @@ export const serwist = async (options: SerwistOptions): Promise<BuildOptions> =>
   };
 };
 
+/**
+ * Integrates Serwist into your Next.js app. Allows reading complete Next.js configuration.
+ * @param optionsFunction
+ * @returns
+ */
+serwist.withNextConfig = async (
+  optionsFunction: (nextConfig: NextConfigComplete) => Promise<SerwistOptions> | SerwistOptions,
+): Promise<BuildOptions> => {
+  const cwd = process.cwd();
+  const isDev = process.env.NODE_ENV === "development";
+  const nextConfig = await loadNextConfig(cwd, isDev);
+  return serwist(await optionsFunction(nextConfig), nextConfig);
+};
+
 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/**/*",