@platformatic/next 2.19.0-alpha.1 → 2.19.0-alpha.10

package/index.js

@@ -16,14 +16,15 @@ import { once } from 'node:events'
 import { readFile } from 'node:fs/promises'
 import { dirname, resolve as pathResolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { satisfies } from 'semver'
+import { parse, satisfies } from 'semver'
 import { packageJson, schema } from './lib/schema.js'
 
-const supportedVersions = '^14.0.0'
+const supportedVersions = ['^14.0.0', '^15.0.0']
 
 export class NextStackable extends BaseStackable {
   #basePath
   #next
+  #nextVersion
   #child
   #server
 
@@ -34,9 +35,10 @@ export class NextStackable extends BaseStackable {
   async init () {
     this.#next = pathResolve(dirname(resolvePackage(this.root, 'next')), '../..')
     const nextPackage = JSON.parse(await readFile(pathResolve(this.#next, 'package.json'), 'utf-8'))
+    this.#nextVersion = parse(nextPackage.version)
 
     /* c8 ignore next 3 */
-    if (!satisfies(nextPackage.version, supportedVersions)) {
+    if (!supportedVersions.some(v => satisfies(nextPackage.version, v))) {
       throw new errors.UnsupportedVersion('next', nextPackage.version, supportedVersions)
     }
   }
@@ -83,6 +85,10 @@ export class NextStackable extends BaseStackable {
   }
 
   async build () {
+    if (!this.#nextVersion) {
+      await this.init()
+    }
+
     const config = this.configManager.current
     const loader = new URL('./lib/loader.js', import.meta.url)
     this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
@@ -94,7 +100,7 @@ export class NextStackable extends BaseStackable {
       command = ['node', pathResolve(this.#next, './dist/bin/next'), 'build', this.root]
     }
 
-    return this.buildWithCommand(command, this.#basePath, loader)
+    return this.buildWithCommand(command, this.#basePath, loader, this.#getChildManagerScripts())
   }
 
   /* c8 ignore next 5 */
@@ -124,7 +130,7 @@ export class NextStackable extends BaseStackable {
     this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
 
     if (command) {
-      return this.startWithCommand(command, loaderUrl)
+      return this.startWithCommand(command, loaderUrl, this.#getChildManagerScripts())
     }
 
     const { hostname, port } = this.serverConfig ?? {}
@@ -148,7 +154,8 @@ export class NextStackable extends BaseStackable {
         runtimeBasePath: this.runtimeConfig.basePath,
         wantsAbsoluteUrls: true,
         telemetryConfig: this.telemetryConfig
-      }
+      },
+      scripts: this.#getChildManagerScripts()
     })
 
     const promise = once(this.childManager, 'url')
@@ -168,7 +175,17 @@ export class NextStackable extends BaseStackable {
     try {
       await this.childManager.inject()
       const childPromise = createChildProcessListener()
-      await nextDev(serverOptions, 'default', this.root)
+
+      if (this.#nextVersion.major === 14 && this.#nextVersion.minor < 2) {
+        await nextDev({
+          '--hostname': serverOptions.host,
+          '--port': serverOptions.port,
+          _: [this.root]
+        })
+      } else {
+        await nextDev(serverOptions, 'default', this.root)
+      }
+
       this.#child = await childPromise
     } finally {
       await this.childManager.eject()
@@ -183,7 +200,7 @@ export class NextStackable extends BaseStackable {
     this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
 
     if (command) {
-      return this.startWithCommand(command, loaderUrl)
+      return this.startWithCommand(command, loaderUrl, this.#getChildManagerScripts())
     }
 
     this.childManager = new ChildManager({
@@ -200,7 +217,8 @@ export class NextStackable extends BaseStackable {
         runtimeBasePath: this.runtimeConfig.basePath,
         wantsAbsoluteUrls: true,
         telemetryConfig: this.telemetryConfig
-      }
+      },
+      scripts: this.#getChildManagerScripts()
     })
 
     this.verifyOutputDirectory(pathResolve(this.root, '.next'))
@@ -230,7 +248,15 @@ export class NextStackable extends BaseStackable {
         (this.isEntrypoint ? serverOptions?.hostname : undefined) ?? true
       )
 
-      await nextStart(serverOptions, this.root)
+      if (this.#nextVersion.major === 14 && this.#nextVersion.minor < 2) {
+        await nextStart({
+          '--hostname': serverOptions.host,
+          '--port': serverOptions.port,
+          _: [this.root]
+        })
+      } else {
+        await nextStart(serverOptions, this.root)
+      }
 
       this.#server = await serverPromise
       this.url = getServerUrl(this.#server)
@@ -238,6 +264,16 @@ export class NextStackable extends BaseStackable {
       await this.childManager.eject()
     }
   }
+
+  #getChildManagerScripts () {
+    const scripts = []
+
+    if (this.#nextVersion.major === 15) {
+      scripts.push(new URL('./lib/loader-next-15.cjs', import.meta.url))
+    }
+
+    return scripts
+  }
 }
 
 /* c8 ignore next 9 */

package/lib/caching/valkey.js

@@ -14,12 +14,29 @@ const sections = {
   tags: 'tags'
 }
 
+const clients = new Map()
+
 export function keyFor (prefix, subprefix, section, key) {
   return [prefix, 'cache:next', subprefix, section, key ? Buffer.from(key).toString('base64url') : undefined]
     .filter(c => c)
     .join(':')
 }
 
+export function getConnection (url) {
+  let client = clients.get(url)
+
+  if (!client) {
+    client = new Redis(url, { enableAutoPipelining: true })
+    clients.set(url, client)
+
+    globalThis.platformatic.events.on('plt:next:close', () => {
+      client.disconnect(false)
+    })
+  }
+
+  return client
+}
+
 export class CacheHandler {
   #config
   #logger
@@ -30,14 +47,9 @@ export class CacheHandler {
   constructor () {
     this.#logger = this.#createLogger()
     this.#config = globalThis.platformatic.config.cache
-    this.#store = new Redis(this.#config.url, { enableAutoPipelining: true })
+    this.#store = getConnection(this.#config.url)
     this.#maxTTL = this.#config.maxTTL
     this.#subprefix = this.#getSubprefix()
-
-    // Handle disconnection not to hang the process on exit
-    globalThis.platformatic.events.on('plt:next:close', () => {
-      this.#store.disconnect(false)
-    })
   }
 
   async get (cacheKey) {
@@ -93,7 +105,12 @@ export class CacheHandler {
       const data = this.#serialize({ value, tags, lastModified: Date.now(), revalidate, maxTTL: this.#maxTTL })
       const expire = Math.min(revalidate, this.#maxTTL)
 
+      if (expire < 1) {
+        return
+      }
+
       // Enqueue all the operations to perform in Valkey
+
       const promises = []
       promises.push(this.#store.set(key, data, 'EX', expire))
 
@@ -155,19 +172,21 @@ export class CacheHandler {
     const life = Math.round((Date.now() - value.lastModified) / 1000)
     const expire = Math.min(value.revalidate - life, this.#maxTTL)
 
-    if (expire > 0) {
-      const promises = []
-      promises.push(this.#store.expire(key, expire, 'gt'))
+    if (expire < 1) {
+      return
+    }
 
-      if (Array.isArray(value.tags)) {
-        for (const tag of value.tags) {
-          const tagsKey = this.#keyFor(tag, sections.tags)
-          promises.push(this.#store.expire(tagsKey, expire, 'gt'))
-        }
-      }
+    const promises = []
+    promises.push(this.#store.expire(key, expire, 'gt'))
 
-      await Promise.all(promises)
+    if (Array.isArray(value.tags)) {
+      for (const tag of value.tags) {
+        const tagsKey = this.#keyFor(tag, sections.tags)
+        promises.push(this.#store.expire(tagsKey, expire, 'gt'))
+      }
     }
+
+    await Promise.all(promises)
   }
 
   #createLogger () {

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

@@ -18,7 +18,7 @@ const originalId = '__pltOriginalNextConfig'
 
 let config
 let candidates
-let basePath
+let basePath = ''
 
 function parseSingleExpression (expr) {
   return parse(expr, { allowAwaitOutsideFunction: true }).program.body[0]
@@ -86,7 +86,7 @@ function createEvaluatorWrapperFunction (original) {
   )
 }
 
-function transformCJS (source) {
+export function transformCJS (source) {
   const ast = parse(source.toString(), { sourceType: 'module' })
 
   // Manipulate the AST
@@ -105,7 +105,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "2.19.0-alpha.1",
+  "version": "2.19.0-alpha.10",
   "description": "Platformatic Next.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -21,25 +21,28 @@
     "@babel/types": "^7.25.2",
     "iovalkey": "^0.2.1",
     "msgpackr": "^1.11.2",
+    "amaro": "^0.2.0",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.19.0-alpha.1",
-    "@platformatic/config": "2.19.0-alpha.1",
-    "@platformatic/utils": "2.19.0-alpha.1"
+    "@platformatic/basic": "2.19.0-alpha.10",
+    "@platformatic/config": "2.19.0-alpha.10",
+    "@platformatic/utils": "2.19.0-alpha.10"
   },
   "devDependencies": {
     "@fastify/reply-from": "^11.0.0",
+    "@types/node": "^22.5.0",
     "borp": "^0.19.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",
+    "next": "^15.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.19.0-alpha.1",
-    "@platformatic/service": "2.19.0-alpha.1"
+    "@platformatic/composer": "2.19.0-alpha.10",
+    "@platformatic/service": "2.19.0-alpha.10"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --no-timeout",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.19.0-alpha.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.19.0-alpha.10.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Stackable",
   "type": "object",