@platformatic/next 3.33.0-alpha.1 → 3.33.0-alpha.2

package/lib/capability.js

@@ -33,7 +33,7 @@ export class NextCapability extends BaseCapability {
   #child
   #server
   #configModified
-  #isStandalone
+  #standaloneEntrypoint
 
   constructor (root, config, context) {
     super('next', version, root, config, context)
@@ -41,15 +41,43 @@ export class NextCapability extends BaseCapability {
     this.exitOnUnhandledErrors = false
   }
 
-  async init () {
+  async init (building = false) {
     await super.init()
 
-    if (this.isProduction && this.config.next?.standalone) {
-      this.#isStandalone = true
+    // This is needed to avoid Next.js to throw an error when the lockfile is not correct
+    // and the user is using npm but has pnpm in its $PATH.
+    //
+    // See: https://github.com/platformatic/composer-next-node-fastify/pull/3
+    //
+    // PS by Paolo: Sob.
+    process.env.NEXT_IGNORE_INCORRECT_LOCKFILE = 'true'
+
+    if (!building && this.isProduction && this.config.next?.standalone) {
+      this.#standaloneEntrypoint = await this.#resolveStandaloneEntrypoint()
+      this.#next = resolvePath(dirname(await resolvePackageViaCJS(this.#standaloneEntrypoint, 'next')), '../..')
+    } else {
+      this.#next = resolvePath(dirname(await resolvePackageViaCJS(this.root, 'next')), '../..')
+    }
+
+    const nextPackage = JSON.parse(await readFile(resolvePath(this.#next, 'package.json'), 'utf-8'))
+    this.#nextVersion = parse(nextPackage.version)
+
+    if (this.#nextVersion.major < 15 || (this.#nextVersion.major <= 15 && this.#nextVersion.minor < 1)) {
+      await import('./create-context-patch.js')
+    }
+
+    if (this.#nextVersion.major < 16 && this.config.next?.useExperimentalAdapter === true) {
+      this.config.next.useExperimentalAdapter = false
+    }
+
+    if (this.isProduction) {
       return
     }
 
-    return this.#init()
+    /* c8 ignore next 3 */
+    if (!supportedVersions.some(v => satisfies(nextPackage.version, v))) {
+      throw new basicErrors.UnsupportedVersion('next', nextPackage.version, supportedVersions)
+    }
   }
 
   async start ({ listen }) {
@@ -107,10 +135,6 @@ export class NextCapability extends BaseCapability {
   }
 
   async build () {
-    if (!this.#nextVersion) {
-      await this.#init()
-    }
-
     const config = this.config
     const loader = new URL('./loader.js', import.meta.url)
     this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
@@ -118,7 +142,7 @@ export class NextCapability extends BaseCapability {
     let command = config.application.commands.build
 
     if (!command) {
-      await this.init()
+      await this.init(true)
       command = ['node', resolvePath(this.#next, './dist/bin/next'), 'build', this.root]
     }
 
@@ -156,33 +180,6 @@ export class NextCapability extends BaseCapability {
     return context
   }
 
-  async #init () {
-    // This is needed to avoid Next.js to throw an error when the lockfile is not correct
-    // and the user is using npm but has pnpm in its $PATH.
-    //
-    // See: https://github.com/platformatic/composer-next-node-fastify/pull/3
-    //
-    // PS by Paolo: Sob.
-    process.env.NEXT_IGNORE_INCORRECT_LOCKFILE = 'true'
-
-    this.#next = resolvePath(dirname(await resolvePackageViaCJS(this.root, 'next')), '../..')
-    const nextPackage = JSON.parse(await readFile(resolvePath(this.#next, 'package.json'), 'utf-8'))
-    this.#nextVersion = parse(nextPackage.version)
-
-    if (this.#nextVersion.major < 15 || (this.#nextVersion.major <= 15 && this.#nextVersion.minor < 1)) {
-      await import('./create-context-patch.js')
-    }
-
-    if (this.#nextVersion.major < 16 && this.config.next?.useExperimentalAdapter === true) {
-      this.config.next.useExperimentalAdapter = false
-    }
-
-    /* c8 ignore next 3 */
-    if (!supportedVersions.some(v => satisfies(nextPackage.version, v))) {
-      throw new basicErrors.UnsupportedVersion('next', nextPackage.version, supportedVersions)
-    }
-  }
-
   async #startDevelopment () {
     const config = this.config
     const loaderUrl = new URL('./loader.js', import.meta.url)
@@ -264,7 +261,7 @@ export class NextCapability extends BaseCapability {
       this.#getChildManagerScripts()
     )
 
-    if (this.#isStandalone) {
+    if (this.#standaloneEntrypoint) {
       return this.#startProductionStandaloneNext()
     } else {
       this.verifyOutputDirectory(resolvePath(this.root, '.next'))
@@ -310,25 +307,6 @@ export class NextCapability extends BaseCapability {
   }
 
   async #startProductionStandaloneNext () {
-    // If built in standalone mode, the generated standalone directory is not on the root of the project but somewhere
-    // inside .next/standalone due to turbopack limitations in determining the root of the project.
-    // In that case we search a server.js next to a .next folder inside the .next /standalone folder.
-    const serverEntrypoints = await Array.fromAsync(
-      glob(['**/server.js'], { cwd: this.root, ignore: ['node_modules', '**/node_modules/**'] })
-    )
-
-    let serverEntrypoint
-    for (const entrypoint of serverEntrypoints) {
-      if (existsSync(resolvePath(this.root, dirname(entrypoint), '.next'))) {
-        serverEntrypoint = resolvePath(this.root, entrypoint)
-        break
-      }
-    }
-
-    if (!serverEntrypoint) {
-      throw new errors.StandaloneServerNotFound()
-    }
-
     // The default Next.js standalone server uses chdir, which is not supported in worker threads.
     // Therefore we need to reproduce the server.js logic here, which what we do in the rest of this method.
 
@@ -336,7 +314,7 @@ export class NextCapability extends BaseCapability {
     // For now we use simple regex parsing, if it breaks, we can switch to proper AST parsing.
     let nextConfig
     try {
-      const serverJsContent = await readFile(serverEntrypoint, 'utf-8')
+      const serverJsContent = await readFile(this.#standaloneEntrypoint, 'utf-8')
       const nextConfigMatch = serverJsContent.match(/(?:const|let)\s*nextConfig\s*=\s*(\{.+)/)
       nextConfig = JSON.parse(nextConfigMatch[1])
     } catch (e) {
@@ -378,10 +356,10 @@ export class NextCapability extends BaseCapability {
 
       // This is needed by Next.js standalone server to pick up the correct configuration
       process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig)
-      const { startServer } = this.#requireStandaloneEntrypoint(serverEntrypoint)
+      const { startServer } = this.#requireStandaloneEntrypoint(this.#standaloneEntrypoint)
 
       await startServer({
-        dir: dirname(serverEntrypoint),
+        dir: dirname(this.#standaloneEntrypoint),
         isDev: false,
         config: nextConfig,
         hostname: serverOptions.hostname,
@@ -462,6 +440,34 @@ export class NextCapability extends BaseCapability {
     return distDir
   }
 
+  async #resolveStandaloneEntrypoint () {
+    // If built in standalone mode, the generated standalone directory is not on the root of the project but somewhere
+    // inside .next/standalone due to turbopack limitations in determining the root of the project.
+    // In that case we search a server.js next to a .next folder inside the .next /standalone folder.
+    const serverEntrypoints = await Array.fromAsync(
+      glob(['**/server.js'], { cwd: this.root, ignore: ['node_modules', '**/node_modules/**'] })
+    )
+
+    let serverEntrypoint
+    for (const entrypoint of serverEntrypoints) {
+      if (existsSync(resolvePath(this.root, dirname(entrypoint), '.next'))) {
+        const candidate = resolvePath(this.root, entrypoint)
+        const contents = await readFile(candidate, 'utf-8')
+
+        if (contents.includes('process.env.__NEXT_PRIVATE_STANDALONE_CONFIG =')) {
+          serverEntrypoint = candidate
+          break
+        }
+      }
+    }
+
+    if (!serverEntrypoint) {
+      throw new errors.StandaloneServerNotFound()
+    }
+
+    return serverEntrypoint
+  }
+
   #requireStandaloneEntrypoint (serverEntrypoint) {
     let serverModule
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "3.33.0-alpha.1",
+  "version": "3.33.0-alpha.2",
   "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.33.0-alpha.1",
-    "@platformatic/foundation": "3.33.0-alpha.1"
+    "@platformatic/basic": "3.33.0-alpha.2",
+    "@platformatic/foundation": "3.33.0-alpha.2"
   },
   "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.33.0-alpha.1",
-    "@platformatic/service": "3.33.0-alpha.1"
+    "@platformatic/gateway": "3.33.0-alpha.2",
+    "@platformatic/service": "3.33.0-alpha.2"
   },
   "engines": {
     "node": ">=22.19.0"

package/schema.json

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