@serwist/next 9.4.0 → 9.4.2

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

package/dist/index.config.js

@@ -2,19 +2,87 @@ 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';
+import { MODERN_BROWSERSLIST_TARGET, PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from 'next/constants.js';
+import browserslist from 'browserslist';
+
+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"
+];
 
 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 __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(), {
+    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 || "/";
@@ -24,7 +92,7 @@ const serwist = async (options)=>{
     const distServerDir = `${distDir}server/`;
     const distAppDir = `${distServerDir}app/`;
     const distPagesDir = `${distServerDir}pages/`;
-    const { precachePrerendered = true, globDirectory = process.cwd(), ...cliOptions } = options;
+    const { precachePrerendered = true, globDirectory = cwd, ...cliOptions } = options;
     for (const file of [
         cliOptions.swDest,
         `${cliOptions.swDest}.map`
@@ -35,7 +103,7 @@ const serwist = async (options)=>{
     }
     return {
         dontCacheBustURLsMatching: new RegExp(`^${distDir}static/`),
-        disablePrecacheManifest: isWatch,
+        disablePrecacheManifest: isDev,
         ...cliOptions,
         globDirectory,
         globPatterns: [
@@ -93,7 +161,11 @@ const serwist = async (options)=>{
                     warnings: []
                 };
             }
-        ]
+        ],
+        esbuildOptions: {
+            ...cliOptions.esbuildOptions,
+            target: cliOptions.esbuildOptions?.target ?? loadBrowserslist(cwd)
+        }
     };
 };
 

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

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

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

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

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

@@ -1,2 +1,9 @@
 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":"AAAA,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC"}
+{"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"}

package/package.json

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

package/src/index.config.ts

@@ -4,14 +4,15 @@ 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 { generateGlobPatterns, loadBrowserslist } 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(), {
+  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 || "/";
@@ -21,13 +22,13 @@ export const serwist = async (options: SerwistOptions): Promise<BuildOptions> =>
   const distServerDir = `${distDir}server/`;
   const distAppDir = `${distServerDir}app/`;
   const distPagesDir = `${distServerDir}pages/`;
-  const { precachePrerendered = true, globDirectory = process.cwd(), ...cliOptions } = options;
+  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: isWatch,
+    disablePrecacheManifest: isDev,
     ...cliOptions,
     globDirectory,
     globPatterns: [
@@ -83,6 +84,10 @@ export const serwist = async (options: SerwistOptions): Promise<BuildOptions> =>
         return { manifest, warnings: [] };
       },
     ],
+    esbuildOptions: {
+      ...cliOptions.esbuildOptions,
+      target: cliOptions.esbuildOptions?.target ?? loadBrowserslist(cwd),
+    },
   };
 };
 

package/src/lib/config/constants.ts

@@ -0,0 +1,4 @@
+/** @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,4 +1,86 @@
+import browserslist from "browserslist";
+import { MODERN_BROWSERSLIST_TARGET } from "next/constants.js";
+import { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS } from "./constants.js";
+
 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(""))
+  );
+};