@serwist/next 9.2.3 → 9.3.0

package/dist/index.js

@@ -6,7 +6,8 @@ import { ChildCompilationPlugin, relativeToOutputPath } from '@serwist/webpack-p
 import { globSync } from 'glob';
 import crypto from 'node:crypto';
 import { createRequire } from 'node:module';
-import chalk from 'chalk';
+import { green, bold, white, yellow, red } from 'kolorist';
+import semver from 'semver';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 import { z } from 'zod';
 import { a as injectManifestOptions } from './chunks/schema.js';
@@ -51,38 +52,44 @@ const loadTSConfig = (baseDir, relativeTSConfigPath)=>{
     }
 };
 
-const mapLoggingMethodToConsole = {
-    wait: "log",
-    error: "error",
-    warn: "warn",
-    info: "log",
-    event: "log"
-};
-const prefixes = {
-    wait: `${chalk.white(chalk.bold("○"))} (serwist)`,
-    error: `${chalk.red(chalk.bold("X"))} (serwist)`,
-    warn: `${chalk.yellow(chalk.bold("⚠"))} (serwist)`,
-    info: `${chalk.white(chalk.bold("○"))} (serwist)`,
-    event: `${chalk.green(chalk.bold("✓"))} (serwist)`
-};
+const require$1 = createRequire(import.meta.url);
+const LOGGING_SPACE_PREFIX = semver.gte(require$1("next/package.json").version, "16.0.0") ? "" : " ";
 const prefixedLog = (prefixType, ...message)=>{
-    const consoleMethod = mapLoggingMethodToConsole[prefixType];
-    const prefix = prefixes[prefixType];
+    let prefix;
+    let consoleMethod;
+    switch(prefixType){
+        case "wait":
+            prefix = `${white(bold("○"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+        case "error":
+            prefix = `${red(bold("X"))} (serwist)`;
+            consoleMethod = "error";
+            break;
+        case "warn":
+            prefix = `${yellow(bold("⚠"))} (serwist)`;
+            consoleMethod = "warn";
+            break;
+        case "info":
+            prefix = `${white(bold("○"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+        case "event":
+            prefix = `${green(bold("✓"))} (serwist)`;
+            consoleMethod = "log";
+            break;
+    }
     if ((message[0] === "" || message[0] === undefined) && message.length === 1) {
         message.shift();
     }
     if (message.length === 0) {
         console[consoleMethod]("");
     } else {
-        console[consoleMethod](` ${prefix}`, ...message);
+        console[consoleMethod](`${LOGGING_SPACE_PREFIX}${prefix}`, ...message);
     }
 };
-const info = (...message)=>{
-    prefixedLog("info", ...message);
-};
-const event = (...message)=>{
-    prefixedLog("event", ...message);
-};
+const info = (...message)=>prefixedLog("info", ...message);
+const event = (...message)=>prefixedLog("event", ...message);
 
 const validateInjectManifestOptions = (input)=>{
     const result = injectManifestOptions.safeParse(input, {
@@ -102,7 +109,7 @@ 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.`);
+        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.`);
     }
     return (nextConfig = {})=>({
             ...nextConfig,

package/dist/lib/logger.d.ts

@@ -1,3 +1,4 @@
+export type LoggingMethods = "wait" | "error" | "warn" | "info" | "event";
 export declare const wait: (...message: any[]) => void;
 export declare const error: (...message: any[]) => void;
 export declare const warn: (...message: any[]) => void;

package/dist/lib/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAEtC,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAEtC,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAyC1E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAAqC,CAAC;AAE7E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,GAAG,EAAE,SAAoC,CAAC;AAE3E,eAAO,MAAM,KAAK,GAAI,GAAG,SAAS,GAAG,EAAE,SAAqC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.2.3",
+  "version": "9.3.0",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -62,25 +62,27 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "chalk": "5.6.2",
     "glob": "10.5.0",
-    "zod": "4.1.12",
-    "@serwist/build": "9.2.3",
-    "@serwist/webpack-plugin": "9.2.3",
-    "@serwist/window": "9.2.3",
-    "serwist": "9.2.3"
+    "kolorist": "1.8.0",
+    "semver": "7.7.3",
+    "zod": "4.2.1",
+    "@serwist/build": "9.3.0",
+    "@serwist/webpack-plugin": "9.3.0",
+    "@serwist/window": "9.3.0",
+    "serwist": "9.3.0"
   },
   "devDependencies": {
-    "@types/node": "24.10.1",
-    "next": "16.0.3",
-    "react": "19.2.0",
-    "react-dom": "19.2.0",
-    "rollup": "4.53.3",
-    "type-fest": "5.2.0",
+    "@types/node": "25.0.3",
+    "@types/semver": "7.7.1",
+    "next": "16.1.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "rollup": "4.54.0",
+    "type-fest": "5.3.1",
     "typescript": "5.9.3",
-    "webpack": "5.103.0",
-    "@serwist/configs": "9.2.3",
-    "@serwist/utils": "9.2.3"
+    "webpack": "5.104.1",
+    "@serwist/configs": "9.3.0",
+    "@serwist/utils": "9.3.0"
   },
   "peerDependencies": {
     "next": ">=14.0.0",

package/src/index.ts

@@ -24,7 +24,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
   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.`,
+      `[@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.`,
     );
   }
   return (nextConfig = {}) => ({

package/src/lib/logger.ts

@@ -1,28 +1,39 @@
-import chalk from "chalk";
+import { createRequire } from "node:module";
+import { bold, green, red, white, yellow } from "kolorist";
+import semver from "semver";
 
-const LOGGING_METHOD = ["wait", "error", "warn", "info", "event"] as const;
+const require = createRequire(import.meta.url);
 
-type LoggingMethods = (typeof LOGGING_METHOD)[number];
+const LOGGING_SPACE_PREFIX = semver.gte(require("next/package.json").version, "16.0.0") ? "" : " ";
 
-const mapLoggingMethodToConsole: Record<LoggingMethods, "log" | "error" | "warn" | "log"> = {
-  wait: "log",
-  error: "error",
-  warn: "warn",
-  info: "log",
-  event: "log",
-};
-
-const prefixes = {
-  wait: `${chalk.white(chalk.bold("○"))} (serwist)`,
-  error: `${chalk.red(chalk.bold("X"))} (serwist)`,
-  warn: `${chalk.yellow(chalk.bold("⚠"))} (serwist)`,
-  info: `${chalk.white(chalk.bold("○"))} (serwist)`,
-  event: `${chalk.green(chalk.bold("✓"))} (serwist)`,
-};
+export type LoggingMethods = "wait" | "error" | "warn" | "info" | "event";
 
 const prefixedLog = (prefixType: LoggingMethods, ...message: any[]) => {
-  const consoleMethod = mapLoggingMethodToConsole[prefixType];
-  const prefix = prefixes[prefixType];
+  let prefix: string;
+  let consoleMethod: keyof Console;
+
+  switch (prefixType) {
+    case "wait":
+      prefix = `${white(bold("○"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+    case "error":
+      prefix = `${red(bold("X"))} (serwist)`;
+      consoleMethod = "error";
+      break;
+    case "warn":
+      prefix = `${yellow(bold("⚠"))} (serwist)`;
+      consoleMethod = "warn";
+      break;
+    case "info":
+      prefix = `${white(bold("○"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+    case "event":
+      prefix = `${green(bold("✓"))} (serwist)`;
+      consoleMethod = "log";
+      break;
+  }
 
   if ((message[0] === "" || message[0] === undefined) && message.length === 1) {
     message.shift();
@@ -32,26 +43,16 @@ const prefixedLog = (prefixType: LoggingMethods, ...message: any[]) => {
   if (message.length === 0) {
     console[consoleMethod]("");
   } else {
-    console[consoleMethod](` ${prefix}`, ...message);
+    console[consoleMethod](`${LOGGING_SPACE_PREFIX}${prefix}`, ...message);
   }
 };
 
-export const wait = (...message: any[]) => {
-  prefixedLog("wait", ...message);
-};
+export const wait = (...message: any[]) => prefixedLog("wait", ...message);
 
-export const error = (...message: any[]) => {
-  prefixedLog("error", ...message);
-};
+export const error = (...message: any[]) => prefixedLog("error", ...message);
 
-export const warn = (...message: any[]) => {
-  prefixedLog("warn", ...message);
-};
+export const warn = (...message: any[]) => prefixedLog("warn", ...message);
 
-export const info = (...message: any[]) => {
-  prefixedLog("info", ...message);
-};
+export const info = (...message: any[]) => prefixedLog("info", ...message);
 
-export const event = (...message: any[]) => {
-  prefixedLog("event", ...message);
-};
+export const event = (...message: any[]) => prefixedLog("event", ...message);