@serwist/next 9.5.2 → 9.5.4

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;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,OA6ErB,CAAC;AAOF,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;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,28 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { rebasePath } from '@serwist/build';
-import { createRequire } from 'module';
+import { browserslistToEsbuild } from '@serwist/utils';
 import browserslist from 'browserslist';
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD, MODERN_BROWSERSLIST_TARGET } from 'next/constants.js';
-
-const SUPPORTED_ESBUILD_TARGETS = [
-    "chrome",
-    "deno",
-    "edge",
-    "firefox",
-    "hermes",
-    "ie",
-    "ios",
-    "node",
-    "opera",
-    "rhino",
-    "safari"
-];
-const UNSUPPORTED_BROWSERLIST_TARGETS = [
-    "android 4",
-    "android 3",
-    "android 2"
-];
+import { createRequire } from 'module';
 
 const __require = createRequire(import.meta.url);
 const nextConfig = __require("next/dist/server/config.js");
@@ -36,53 +18,6 @@ const generateGlobPatterns = (distDir)=>[
         `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
         "public/**/*"
     ];
-const compare = (a, b)=>{
-    if (a < b) return -1;
-    if (a > b) return 1;
-    return 0;
-};
-const compareSemver = (a, b)=>{
-    return compare(Number.parseInt(a[0], 10), Number.parseInt(b[0], 10)) || compare(Number.parseInt(a[1] || "0", 10), Number.parseInt(b[1] || "0", 10)) || compare(Number.parseInt(a[2] || "0", 10), Number.parseInt(b[2] || "0", 10));
-};
-const loadBrowserslist = (cwd)=>{
-    const browserslistConfig = browserslist.loadConfig({
-        path: cwd
-    }) ?? MODERN_BROWSERSLIST_TARGET;
-    return browserslist(browserslistConfig).filter((query)=>!UNSUPPORTED_BROWSERLIST_TARGETS.some((target)=>query.startsWith(target))).map((query)=>{
-        const modified = query === "safari TP" ? browserslist("last 1 safari version")[0] : query;
-        const split = modified.split(" ");
-        if (split[0] === "android" || split[0] === "and_chr") {
-            split[0] = "chrome";
-        }
-        if (split[0] === "and_ff") {
-            split[0] = "firefox";
-        }
-        if (split[0] === "ios_saf" || split[0] === "ios") {
-            split[0] = "safari";
-        }
-        if (split[1].includes("-")) {
-            split[1] = split[1].slice(0, split[1].indexOf("-"));
-        }
-        if (split[1].endsWith(".0")) {
-            split[1] = split[1].slice(0, -2);
-        }
-        return split;
-    }).filter((split)=>SUPPORTED_ESBUILD_TARGETS.includes(split[0]) && /^\d+(\.\d+)*$/.test(split[1])).sort((a, b)=>{
-        if (a[0] === b[0]) {
-            return compareSemver(b[1].split("."), a[1].split("."));
-        } else {
-            return compare(a[0], b[0]);
-        }
-    }).reduce((acc, browser)=>{
-        const existingIndex = acc.findIndex((br)=>br[0] === browser[0]);
-        if (existingIndex !== -1) {
-            acc[existingIndex][1] = browser[1];
-        } else {
-            acc.push(browser);
-        }
-        return acc;
-    }, []).map((split)=>split.join(""));
-};
 
 const _cwd = process.cwd();
 const _isDev = process.env.NODE_ENV === "development";
@@ -168,7 +103,7 @@ const serwist = async (options, nextConfig, { cwd = _cwd, isDev = _isDev } = {})
         ],
         esbuildOptions: {
             ...cliOptions.esbuildOptions,
-            target: cliOptions.esbuildOptions?.target ?? loadBrowserslist(cwd)
+            target: cliOptions.esbuildOptions?.target ?? browserslistToEsbuild(browserslist, cwd, MODERN_BROWSERSLIST_TARGET)
         }
     };
 };

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,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"}
+{"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"}

package/dist/index.js

@@ -105,11 +105,20 @@ const validateInjectManifestOptions = (input)=>{
 };
 
 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.`);
+    if (!process.env.SERWIST_SUPPRESS_TURBOPACK_WARNING && process.env.TURBOPACK && !userOptions.disable) {
+        process.env.SERWIST_SUPPRESS_TURBOPACK_WARNING = "1";
+        console.warn(`[@serwist/next] WARNING: You are using '@serwist/next' with \`next dev --turbopack\`, but it doesn't support Turbopack. Do one of the following:
+
+- Set \`disable\` to \`process.env.NODE_ENV !== "production"\`.
+
+- Use webpack by running \`next dev --webpack\` instead of \`next dev --turbopack\`.
+
+- Migrate to '@serwist/turbopack' which has experimental support for Turbopack. See https://serwist.pages.dev/docs/next/turbo for more information.
+
+- Migrate to configurator mode which has support for Turbopack. See https://serwist.pages.dev/docs/next/config for more information. 
+
+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.\n`);
     }
     return (nextConfig = {})=>({
             ...nextConfig,

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

@@ -1,4 +1,2 @@
-/** @see https://esbuild.github.io/api/#target */
-export declare const SUPPORTED_ESBUILD_TARGETS: string[];
-export declare const UNSUPPORTED_BROWSERLIST_TARGETS: string[];
+export {};
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/config/constants.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,eAAO,MAAM,yBAAyB,UAAmG,CAAC;AAE1I,eAAO,MAAM,+BAA+B,UAA0C,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/config/constants.ts"],"names":[],"mappings":""}

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

@@ -1,10 +1,3 @@
 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.
- *
- * @param cwd
- * @returns
- */
-export declare const loadBrowserslist: (cwd: string) => string[];
 //# sourceMappingURL=utils.d.ts.map

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":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/config/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,EAAE,OAAO,OAAO,4EAKzD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC"}

package/package.json

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

package/src/index.config.ts

@@ -2,9 +2,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { rebasePath } from "@serwist/build";
 import type { BuildOptions } from "@serwist/cli";
+import { browserslistToEsbuild } from "@serwist/utils";
+import browserslist from "browserslist";
+import { MODERN_BROWSERSLIST_TARGET } 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, loadNextConfig } from "./lib/config/utils.js";
+import { generateGlobPatterns, loadNextConfig } from "./lib/config/utils.js";
 
 const _cwd = process.cwd();
 const _isDev = process.env.NODE_ENV === "development";
@@ -116,7 +119,7 @@ export const serwist: Serwist = async (options, nextConfig, { cwd = _cwd, isDev
     ],
     esbuildOptions: {
       ...cliOptions.esbuildOptions,
-      target: cliOptions.esbuildOptions?.target ?? loadBrowserslist(cwd),
+      target: cliOptions.esbuildOptions?.target ?? browserslistToEsbuild(browserslist, cwd, MODERN_BROWSERSLIST_TARGET),
     },
   };
 };

package/src/index.ts

@@ -13,18 +13,26 @@ 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;
+  if (!process.env.SERWIST_SUPPRESS_TURBOPACK_WARNING && process.env.TURBOPACK && !userOptions.disable) {
+    process.env.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.`,
+      `[@serwist/next] WARNING: You are using '@serwist/next' with \`next dev --turbopack\`, but it doesn't support Turbopack. Do one of the following:
+
+- Set \`disable\` to \`process.env.NODE_ENV !== "production"\`.
+
+- Use webpack by running \`next dev --webpack\` instead of \`next dev --turbopack\`.
+
+- Migrate to '@serwist/turbopack' which has experimental support for Turbopack. See https://serwist.pages.dev/docs/next/turbo for more information.
+
+- Migrate to configurator mode which has support for Turbopack. See https://serwist.pages.dev/docs/next/config for more information. 
+
+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.\n`,
     );
   }
   return (nextConfig = {}) => ({

package/src/lib/config/constants.ts

@@ -1,4 +0,0 @@
-/** @see https://esbuild.github.io/api/#target */
-export const SUPPORTED_ESBUILD_TARGETS = ["chrome", "deno", "edge", "firefox", "hermes", "ie", "ios", "node", "opera", "rhino", "safari"];
-
-export const UNSUPPORTED_BROWSERLIST_TARGETS = ["android 4", "android 3", "android 2"];

package/src/lib/config/utils.ts

@@ -1,6 +1,4 @@
-import browserslist from "browserslist";
-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 { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "next/constants.js";
 
 import nextConfig = require("next/dist/server/config.js");
 
@@ -15,81 +13,3 @@ 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/**/*",
 ];
-
-// Source: https://github.com/browserslist/browserslist/blob/5cad191bc1a1e5beb7768ca263503cc15d0dcc7d/index.js#L139-L151
-// License: MIT
-const compare = <T extends string | number>(a: T, b: T) => {
-  if (a < b) return -1;
-  if (a > b) return +1;
-  return 0;
-};
-const compareSemver = (a: string[], b: string[]) => {
-  return (
-    compare(Number.parseInt(a[0], 10), Number.parseInt(b[0], 10)) ||
-    compare(Number.parseInt(a[1] || "0", 10), Number.parseInt(b[1] || "0", 10)) ||
-    compare(Number.parseInt(a[2] || "0", 10), Number.parseInt(b[2] || "0", 10))
-  );
-};
-
-// Original: https://github.com/marcofugaro/browserslist-to-esbuild/blob/0875f1a4ec71f206a634ba406c3528ca5ecf04de/src/index.js
-// License: MIT
-/**
- * Loads and converts Browserslist into esbuild's `target` option.
- *
- * @param cwd
- * @returns
- */
-export const loadBrowserslist = (cwd: string): string[] => {
-  const browserslistConfig = browserslist.loadConfig({ path: cwd }) ?? MODERN_BROWSERSLIST_TARGET;
-  return (
-    browserslist(browserslistConfig)
-      // Filter out legacy Android webview to avoid converting them into Chrome targets
-      .filter((query) => !UNSUPPORTED_BROWSERLIST_TARGETS.some((target) => query.startsWith(target)))
-      .map((query) => {
-        const modified = query === "safari TP" ? browserslist("last 1 safari version")[0] : query;
-        const split = modified.split(" ");
-        // https://github.com/browserslist/browserslist/blob/5cad191bc1a1e5beb7768ca263503cc15d0dcc7d/README.md?plain=1#L329-L350
-        // https://esbuild.github.io/api/#target
-        if (split[0] === "android" || split[0] === "and_chr") {
-          split[0] = "chrome";
-        }
-        if (split[0] === "and_ff") {
-          split[0] = "firefox";
-        }
-        if (split[0] === "ios_saf" || split[0] === "ios") {
-          split[0] = "safari";
-        }
-        // Remove upper version bound
-        if (split[1].includes("-")) {
-          split[1] = split[1].slice(0, split[1].indexOf("-"));
-        }
-        // Trim ending .0
-        if (split[1].endsWith(".0")) {
-          split[1] = split[1].slice(0, -2);
-        }
-        return split;
-      })
-      // Remove unsupported browsers and invalid versions
-      .filter((split) => SUPPORTED_ESBUILD_TARGETS.includes(split[0]) && /^\d+(\.\d+)*$/.test(split[1]))
-      // Re-sort the result such that the oldest versions end up the latest, same as how
-      // Browserslist does it.
-      .sort((a, b) => {
-        if (a[0] === b[0]) {
-          return compareSemver(b[1].split("."), a[1].split("."));
-        } else {
-          return compare(a[0], b[0]);
-        }
-      })
-      // Only pick the oldest included version for each browser to avoid duplications.
-      .reduce((acc, browser) => {
-        const existingIndex = acc.findIndex((br) => br[0] === browser[0]);
-        if (existingIndex !== -1) {
-          acc[existingIndex][1] = browser[1];
-        } else {
-          acc.push(browser);
-        }
-        return acc;
-      }, [] as string[][])
-      .map((split) => split.join(""))
-  );
-};