@platformatic/next 3.37.0 → 3.38.0

package/config.d.ts

@@ -650,10 +650,12 @@ export interface PlatformaticNextJsConfig {
     useExperimentalAdapter?: boolean;
   };
   cache?: {
+    enabled?: boolean | string;
     adapter: "redis" | "valkey";
     url: string;
     prefix?: string;
     cacheComponents?: boolean;
     maxTTL?: number | string;
+    ignoreNextConfig?: boolean | string;
   };
 }

package/index.js

@@ -20,6 +20,43 @@ export function getAdapterPath () {
   return resolvePath(import.meta.dirname, 'lib', 'adapter.js')
 }
 
+function enhanceNextCacheConfig (nextConfig, modifications) {
+  const { config, nextVersion, logger } = globalThis.platformatic
+
+  if (!config.cache?.adapter || config.cache?.enabled === false) return
+
+  const existingCacheHandlers = typeof nextConfig.cacheHandler !== 'undefined' || typeof nextConfig.cacheHandlers?.default !== 'undefined'
+  if (existingCacheHandlers) {
+    if (!config.cache.ignoreNextConfig) {
+      return logger.warn('Next.js cache handlers are already defined in next.config.js. Skipping cache configuration.')
+    }
+  }
+
+  const cacheComponentsConflict = typeof config.cache?.cacheComponents !== 'undefined' && typeof nextConfig.cacheComponents !== 'undefined' && config.cache?.cacheComponents !== nextConfig.cacheComponents
+  if (cacheComponentsConflict) {
+    if (!config.cache.ignoreNextConfig) {
+      return logger.warn('Platformatic and Next.js Cache Components configs are conflicting. Skipping cache configuration.')
+    }
+    nextConfig.cacheComponents = config.cache?.cacheComponents
+  }
+
+  if (config.cache?.cacheComponents || nextConfig.cacheComponents) {
+    if (nextVersion.major <= 15) {
+      return logger.warn('Next.js Cache Components are only supported in Next.js 16 and above. Skipping cache configuration.')
+    }
+    nextConfig.cacheComponents = true
+    nextConfig.cacheHandler = getCacheHandlerPath('null-isr')
+    nextConfig.cacheHandlers = { default: getCacheHandlerPath(`${config.cache.adapter}-components`) }
+    nextConfig.cacheMaxMemorySize = 0
+    modifications.push(['componentsCache', config.cache.adapter])
+  } else {
+    delete nextConfig.cacheHandlers
+    nextConfig.cacheHandler = getCacheHandlerPath(`${config.cache.adapter}-isr`)
+    nextConfig.cacheMaxMemorySize = 0
+    modifications.push(['isrCache', config.cache.adapter])
+  }
+}
+
 export async function enhanceNextConfig (nextConfig, ...args) {
   // This is to avoid https://github.com/vercel/next.js/issues/76981
   Headers.prototype[Symbol.for('nodejs.util.inspect.custom')] = undefined
@@ -28,7 +65,7 @@ export async function enhanceNextConfig (nextConfig, ...args) {
     nextConfig = await nextConfig(...args)
   }
 
-  const { basePath, config, nextVersion } = globalThis.platformatic
+  const { basePath, config } = globalThis.platformatic
 
   if (typeof nextConfig.basePath === 'undefined') {
     nextConfig.basePath = basePath
@@ -36,19 +73,7 @@ export async function enhanceNextConfig (nextConfig, ...args) {
 
   const modifications = []
 
-  if (config.cache?.adapter) {
-    if (nextVersion.major > 15 && config.cache?.cacheComponents && typeof nextConfig.cacheComponents === 'undefined') {
-      nextConfig.cacheComponents = true
-      nextConfig.cacheHandler = getCacheHandlerPath('null-isr')
-      nextConfig.cacheHandlers = { default: getCacheHandlerPath(`${config.cache.adapter}-components`) }
-      nextConfig.cacheMaxMemorySize = 0
-      modifications.push(['componentsCache', config.cache.adapter])
-    } else if (typeof nextConfig.cacheHandler === 'undefined') {
-      nextConfig.cacheHandler = getCacheHandlerPath(`${config.cache.adapter}-isr`)
-      nextConfig.cacheMaxMemorySize = 0
-      modifications.push(['isrCache', config.cache.adapter])
-    }
-  }
+  enhanceNextCacheConfig(nextConfig, modifications)
 
   if (config.next?.trailingSlash && typeof nextConfig.trailingSlash === 'undefined') {
     nextConfig.trailingSlash = true

package/lib/caching/valkey-common.js

@@ -24,7 +24,7 @@ export function keyFor (prefix, subprefix, section, key) {
   }
 
   if (key?.length) {
-    result += Buffer.from(key).toString('base64url')
+    result += ':' + Buffer.from(key).toString('base64url')
   }
 
   return result

package/lib/schema.js

@@ -9,6 +9,16 @@ export const version = packageJson.version
 export const cache = {
   type: 'object',
   properties: {
+    enabled: {
+      anyOf: [
+        {
+          type: 'boolean'
+        },
+        {
+          type: 'string'
+        }
+      ]
+    },
     adapter: {
       type: 'string',
       enum: ['redis', 'valkey']
@@ -33,6 +43,16 @@ export const cache = {
           type: 'string'
         }
       ]
+    },
+    ignoreNextConfig: {
+      anyOf: [
+        {
+          type: 'boolean'
+        },
+        {
+          type: 'string'
+        }
+      ]
     }
   },
   required: ['adapter', 'url'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
@@ -23,8 +23,8 @@
     "iovalkey": "^0.3.0",
     "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "3.37.0",
-    "@platformatic/foundation": "3.37.0"
+    "@platformatic/basic": "3.38.0",
+    "@platformatic/foundation": "3.38.0"
   },
   "devDependencies": {
     "@fastify/reply-from": "^12.0.0",
@@ -40,8 +40,8 @@
     "next": "^16.0.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/gateway": "3.37.0",
-    "@platformatic/service": "3.37.0"
+    "@platformatic/service": "3.38.0",
+    "@platformatic/gateway": "3.38.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.37.0.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/3.38.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Config",
   "type": "object",
@@ -2380,6 +2380,16 @@
     "cache": {
       "type": "object",
       "properties": {
+        "enabled": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "adapter": {
           "type": "string",
           "enum": [
@@ -2407,6 +2417,16 @@
               "type": "string"
             }
           ]
+        },
+        "ignoreNextConfig": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [