@platformatic/next 3.4.1 → 3.5.0

package/lib/create-context-patch.js

@@ -0,0 +1,31 @@
+'use strict'
+
+import { createRequire } from 'node:module'
+import { getGlobalDispatcher } from 'undici'
+
+// Next.js runs middlewares in it's own patched vm context. So the global dispatcher in
+// the middleware context is different from an application global dispatcher. This
+// method sets an application global dispatcher after next.js defines it's own version of
+// fetch function.
+export function patchVmCreateContext () {
+  const _require = createRequire(process.cwd())
+  const vm = _require('node:vm')
+
+  const originalCreateContext = vm.createContext
+  vm.createContext = (contextObject, opts) => {
+    const globalDispatcher = getGlobalDispatcher()
+    const context = originalCreateContext(contextObject, opts)
+    queueMicrotask(() => {
+      if (contextObject.fetch === undefined) return
+
+      const originalFetch = contextObject.fetch
+      contextObject.fetch = (input, init = {}) => {
+        init.dispatcher = globalDispatcher
+        return originalFetch(input, init)
+      }
+    })
+    return context
+  }
+}
+
+patchVmCreateContext()

package/lib/loader-next-15.cjs

@@ -0,0 +1,52 @@
+const { resolve } = require('node:path')
+const { fileURLToPath } = require('node:url')
+const fsPromises = require('node:fs').promises
+const { transformSync } = require('amaro')
+const { parse } = require('@babel/parser')
+const traverse = require('@babel/traverse')
+
+const originalReadFile = fsPromises.readFile
+const targetFile = resolve(fileURLToPath(globalThis.platformatic.root), 'next.config.ts')
+
+function detectFormat (code) {
+  let format = 'esm'
+
+  const ast = parse(code, { sourceType: 'module' })
+
+  // Manipulate the AST
+  traverse.default(ast, {
+    AssignmentExpression (path) {
+      const { left } = path.node
+
+      // module.exports = $EXPRESSION
+      if (left.object.name === 'module' && left.property.name === 'exports') {
+        format = 'cjs'
+        path.stop()
+      }
+    }
+  })
+
+  return format
+}
+
+fsPromises.readFile = async function WTF (url, options) {
+  if (url.startsWith('file://')) {
+    url = fileURLToPath(url)
+  }
+
+  const contents = await originalReadFile(url, options)
+
+  if (url !== targetFile) {
+    return contents
+  }
+
+  const { code } = transformSync(contents.toString('utf-8'), { mode: 'strip-only' })
+
+  const { transformESM, transformCJS } = await import('./loader.js')
+  const transformer = detectFormat(code) === 'esm' ? transformESM : transformCJS
+  const transformed = transformer(code)
+
+  // Restore the original method
+  fsPromises.readFile = originalReadFile
+  return transformed
+}

package/lib/loader.js

@@ -11,12 +11,14 @@ import {
   variableDeclarator
 } from '@babel/types'
 import { readFile, realpath } from 'node:fs/promises'
+import { sep } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
 const originalId = '__pltOriginalNextConfig'
 
+let config
 let candidates
-let basePath
+let basePath = ''
 
 function parseSingleExpression (expr) {
   return parse(expr, { allowAwaitOutsideFunction: true }).program.body[0]
@@ -35,37 +37,63 @@ function parseSingleExpression (expr) {
       __pltOriginalNextConfig.basePath = basePath
     }
 
-    // This is to send the configuraion when Next is executed in a child process (development)
-    globalThis[Symbol.for('plt.children.itc')]?.notify('config', __pltOriginalNextConfig)
+    if(typeof __pltOriginalNextConfig.cacheHandler === 'undefined') {
+      __pltOriginalNextConfig.cacheHandler = $PATH
+      __pltOriginalNextConfig.cacheMaxMemorySize = 0
+    }
 
-    // This is to send the configuraion when Next is executed in the same process (production)
-    process.emit('plt:next:config', __pltOriginalNextConfig)
+    // This is to send the configuraion when Next is executed in a child process
+    globalThis.platformatic.notifyConfig(__pltOriginalNextConfig)
 
     return __pltOriginalNextConfig;
   }
 */
 function createEvaluatorWrapperFunction (original) {
+  const cacheHandler = config?.cache?.adapter
+    ? fileURLToPath(new URL(`./caching/${config.cache.adapter}.js`, import.meta.url)).replaceAll(sep, '/')
+    : undefined
+
+  const trailingSlash = config?.next?.trailingSlash
+
   return functionDeclaration(
     null,
     [restElement(identifier('args'))],
-    blockStatement([
-      variableDeclaration('let', [variableDeclarator(identifier(originalId), original)]),
-      parseSingleExpression(
-        `if (typeof ${originalId} === 'function') { ${originalId} = await ${originalId}(...args) }`
-      ),
-      parseSingleExpression(
-        `if (typeof ${originalId}.basePath === 'undefined') { ${originalId}.basePath = "${basePath}" }`
-      ),
-      parseSingleExpression(`globalThis[Symbol.for('plt.children.itc')]?.notify('config', ${originalId})`),
-      parseSingleExpression(`process.emit('plt:next:config', ${originalId})`),
-      returnStatement(identifier(originalId))
-    ]),
+    blockStatement(
+      [
+        // This is to avoid https://github.com/vercel/next.js/issues/76981
+        parseSingleExpression("Headers.prototype[Symbol.for('nodejs.util.inspect.custom')] = undefined"),
+        variableDeclaration('let', [variableDeclarator(identifier(originalId), original)]),
+        parseSingleExpression(
+          `if (typeof ${originalId} === 'function') { ${originalId} = await ${originalId}(...args) }`
+        ),
+        parseSingleExpression(
+          `if (typeof ${originalId}.basePath === 'undefined') { ${originalId}.basePath = "${basePath}" }`
+        ),
+        cacheHandler
+          ? parseSingleExpression(`
+              if (typeof ${originalId}.cacheHandler === 'undefined') {
+                ${originalId}.cacheHandler = '${cacheHandler}'
+                ${originalId}.cacheMaxMemorySize = 0
+              }  
+            `)
+          : undefined,
+        trailingSlash
+          ? parseSingleExpression(`
+              if (typeof ${originalId}.trailingSlash === 'undefined') { 
+                ${originalId}.trailingSlash = true
+              }
+            `)
+          : undefined,
+        parseSingleExpression(`globalThis.platformatic.notifyConfig(${originalId})`),
+        returnStatement(identifier(originalId))
+      ].filter(e => e)
+    ),
     false,
     true
   )
 }
 
-function transformCJS (source) {
+export function transformCJS (source) {
   const ast = parse(source.toString(), { sourceType: 'module' })
 
   // Manipulate the AST
@@ -84,7 +112,7 @@ function transformCJS (source) {
   return generate.default(ast).code
 }
 
-function transformESM (source) {
+export function transformESM (source) {
   const ast = parse(source.toString(), { sourceType: 'module' })
 
   // Manipulate the AST
@@ -125,6 +153,7 @@ export async function initialize (data) {
   // Keep in sync with https://github.com/vercel/next.js/blob/main/packages/next/src/shared/lib/constants.ts
   candidates = ['next.config.js', 'next.config.mjs'].map(c => new URL(c, realRoot).toString())
   basePath = data.basePath ?? ''
+  config = data.config
 }
 
 export async function load (url, context, nextLoad) {

package/lib/schema.js

@@ -1,13 +1,59 @@
-import { schemaComponents } from '@platformatic/basic'
-import { schemaComponents as utilsSchemaComponents } from '@platformatic/utils'
+import { schemaComponents as basicSchemaComponents } from '@platformatic/basic'
+import { schemaComponents as utilsSchemaComponents } from '@platformatic/foundation'
 import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 
-export const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8'))
+export const packageJson = JSON.parse(readFileSync(resolve(import.meta.dirname, '../package.json'), 'utf8'))
+export const version = packageJson.version
+
+export const cache = {
+  type: 'object',
+  properties: {
+    adapter: {
+      type: 'string',
+      enum: ['redis', 'valkey']
+    },
+    url: {
+      type: 'string'
+    },
+    prefix: {
+      type: 'string'
+    },
+    maxTTL: {
+      default: 86400 * 7, // One week
+      anyOf: [
+        {
+          type: 'number',
+          minimum: 0
+        },
+        {
+          type: 'string'
+        }
+      ]
+    }
+  },
+  required: ['adapter', 'url'],
+  additionalProperties: false
+}
+
+const next = {
+  type: 'object',
+  properties: {
+    trailingSlash: {
+      type: 'boolean',
+      default: false
+    }
+  },
+  default: {},
+  additionalProperties: false
+}
+
+export const schemaComponents = { next }
 
 export const schema = {
   $id: `https://schemas.platformatic.dev/@platformatic/next/${packageJson.version}.json`,
   $schema: 'http://json-schema.org/draft-07/schema#',
-  title: 'Platformatic Next.js Stackable',
+  title: 'Platformatic Next.js Config',
   type: 'object',
   properties: {
     $schema: {
@@ -15,8 +61,11 @@ export const schema = {
     },
     logger: utilsSchemaComponents.logger,
     server: utilsSchemaComponents.server,
-    watch: schemaComponents.watch,
-    application: schemaComponents.application
+    watch: basicSchemaComponents.watch,
+    application: basicSchemaComponents.buildableApplication,
+    runtime: utilsSchemaComponents.wrappedRuntime,
+    next,
+    cache
   },
   additionalProperties: false
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@platformatic/next",
-  "version": "3.4.1",
-  "description": "Platformatic Next.js Stackable",
+  "version": "3.5.0",
+  "description": "Platformatic Next.js Capability",
   "main": "index.js",
   "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/platformatic/platformatic.git"
   },
-  "author": "Paolo Insogna <paolo@cowtech.it>",
+  "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/platformatic/platformatic/issues"
@@ -19,32 +19,38 @@
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
+    "amaro": "^0.3.0",
+    "iovalkey": "^0.3.0",
+    "msgpackr": "^1.11.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "3.4.1",
-    "@platformatic/config": "3.4.1",
-    "@platformatic/utils": "3.4.1"
+    "@platformatic/basic": "3.5.0",
+    "@platformatic/foundation": "3.5.0"
   },
   "devDependencies": {
-    "@fastify/reply-from": "^11.0.0",
-    "borp": "^0.17.0",
+    "@fastify/reply-from": "^12.0.0",
+    "@types/node": "^22.5.0",
+    "@types/react": "^19.1.11",
+    "@types/react-dom": "^19.1.7",
+    "cleaner-spec-reporter": "^0.5.0",
     "eslint": "9",
+    "execa": "^9.5.1",
     "fastify": "^5.0.0",
     "json-schema-to-typescript": "^15.0.1",
-    "neostandard": "^0.11.1",
-    "next": "^14.2.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "neostandard": "^0.12.0",
+    "next": "^15.0.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "3.4.1",
-    "@platformatic/service": "3.4.1"
+    "@platformatic/service": "3.5.0",
+    "@platformatic/gateway": "3.5.0"
+  },
+  "engines": {
+    "node": ">=22.19.0"
   },
   "scripts": {
-    "test": "npm run lint && borp --concurrency=1 --no-timeout",
-    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --no-timeout",
+    "test": "node --test --test-reporter=cleaner-spec-reporter --test-concurrency=1 --test-timeout=2000000 test/*.test.js test/**/*.test.js",
     "gen-schema": "node lib/schema.js > schema.json",
     "gen-types": "json2ts > config.d.ts < schema.json",
-    "build": "pnpm run gen-schema && pnpm run gen-types",
+    "build": "npm run gen-schema && npm run gen-types",
     "lint": "eslint"
   }
 }