@platformatic/next 2.0.0-alpha.7 → 2.0.0-alpha.8

package/config.d.ts

@@ -152,12 +152,13 @@ export interface PlatformaticNextJsStackable {
     | string;
   application?: {
     basePath?: string;
-  };
-  deploy?: {
+    outputDirectory?: string;
     include?: string[];
-    buildCommand?: string;
-    installCommand?: string;
-    startCommand?: string;
-    [k: string]: unknown;
+    commands?: {
+      install?: string;
+      build?: string;
+      development?: string;
+      production?: string;
+    };
   };
 }

package/eslint.config.js

@@ -1,5 +1,5 @@
 import neostandard from 'neostandard'
 
 export default neostandard({
-  ignores: ['test/tmp/version.js', '**/.next'],
+  ignores: ['**/.next', '**/dist', '**/tmp', 'test/fixtures/**'],
 })

package/index.js

@@ -2,14 +2,18 @@ import {
   BaseStackable,
   transformConfig as basicTransformConfig,
   ChildManager,
+  cleanBasePath,
+  createChildProcessListener,
+  createServerListener,
   errors,
+  getServerUrl,
   importFile,
+  resolvePackage,
   schemaOptions
 } from '@platformatic/basic'
 import { ConfigManager } from '@platformatic/config'
 import { once } from 'node:events'
 import { readFile } from 'node:fs/promises'
-import { createRequire } from 'node:module'
 import { dirname, resolve as pathResolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { satisfies } from 'semver'
@@ -21,13 +25,15 @@ export class NextStackable extends BaseStackable {
   #basePath
   #next
   #manager
+  #child
+  #server
 
   constructor (options, root, configManager) {
     super('next', packageJson.version, options, root, configManager)
   }
 
   async init () {
-    this.#next = pathResolve(dirname(createRequire(this.root).resolve('next')), '../..')
+    this.#next = pathResolve(dirname(resolvePackage(this.root, 'next')), '../..')
     const nextPackage = JSON.parse(await readFile(pathResolve(this.#next, 'package.json'), 'utf-8'))
 
     /* c8 ignore next 3 */
@@ -36,15 +42,91 @@ export class NextStackable extends BaseStackable {
     }
   }
 
-  async start () {
+  async start ({ listen }) {
     // Make this idempotent
     if (this.url) {
       return this.url
     }
 
+    if (this.isProduction) {
+      await this.#startProduction(listen)
+    } else {
+      await this.#startDevelopment(listen)
+    }
+  }
+
+  async stop () {
+    if (this.subprocess) {
+      return this.stopCommand()
+    }
+
+    if (this.isProduction) {
+      return new Promise((resolve, reject) => {
+        this.#server.close(error => {
+          /* c8 ignore next 3 */
+          if (error) {
+            return reject(error)
+          }
+
+          resolve()
+        })
+      })
+    } else {
+      const exitPromise = once(this.#child, 'exit')
+      await this.#manager.close()
+      process.kill(this.#child.pid, 'SIGKILL')
+      await exitPromise
+    }
+  }
+
+  async build () {
     const config = this.configManager.current
-    const require = createRequire(this.root)
-    const nextRoot = require.resolve('next')
+    const loader = new URL('./lib/loader.js', import.meta.url)
+    this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
+
+    let command = config.application.commands.build
+
+    if (!command) {
+      await this.init()
+      command = ['node', pathResolve(this.#next, './dist/bin/next'), 'build', this.root]
+    }
+
+    return this.buildWithCommand(command, this.#basePath, loader)
+  }
+
+  /* c8 ignore next 5 */
+  async getWatchConfig () {
+    return {
+      enabled: false
+    }
+  }
+
+  getMeta () {
+    let composer = { prefix: this.servicePrefix, wantsAbsoluteUrls: true, needsRootRedirect: false }
+
+    if (this.url) {
+      composer = {
+        tcp: true,
+        url: this.url,
+        prefix: this.#basePath ?? this.servicePrefix,
+        wantsAbsoluteUrls: true,
+        needsRootRedirect: false
+      }
+    }
+
+    return { composer }
+  }
+
+  async #startDevelopment () {
+    const config = this.configManager.current
+    const loaderUrl = new URL('./lib/loader.js', import.meta.url)
+    const command = this.configManager.current.application.commands.development
+
+    this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
+
+    if (command) {
+      return this.startWithCommand(command, loaderUrl)
+    }
 
     const { hostname, port } = this.serverConfig ?? {}
     const serverOptions = {
@@ -52,65 +134,91 @@ export class NextStackable extends BaseStackable {
       port: port || 0
     }
 
-    this.#basePath = config.application?.basePath
-      ? `/${config.application?.basePath}`.replaceAll(/\/+/g, '/').replace(/\/$/, '')
-      : ''
-
     this.#manager = new ChildManager({
-      loader: new URL('./lib/loader.js', import.meta.url),
+      loader: loaderUrl,
       context: {
+        id: this.id,
         // Always use URL to avoid serialization problem in Windows
-        root: pathToFileURL(this.root),
+        root: pathToFileURL(this.root).toString(),
         basePath: this.#basePath,
-        logger: { id: this.id, level: this.logger.level }
+        logLevel: this.logger.level
       }
     })
 
+    const promise = once(this.#manager, 'url')
+    await this.#startDevelopmentNext(serverOptions)
+    this.url = (await promise)[0]
+  }
+
+  async #startDevelopmentNext (serverOptions) {
+    const { nextDev } = await importFile(pathResolve(this.#next, './dist/cli/next-dev.js'))
+
     this.#manager.on('config', config => {
       this.#basePath = config.basePath.replace(/(^\/)|(\/$)/g, '')
     })
 
-    const promise = once(this.#manager, 'url')
-    await this.#startNext(nextRoot, serverOptions)
-    this.url = (await promise)[0]
+    try {
+      await this.#manager.inject()
+      const childPromise = createChildProcessListener()
+      await nextDev(serverOptions, 'default', this.root)
+      this.#child = await childPromise
+    } finally {
+      await this.#manager.eject()
+    }
   }
 
-  async stop () {
-    const exitPromise = once(this.#manager, 'exit')
+  async #startProduction (listen) {
+    const config = this.configManager.current
+    const loaderUrl = new URL('./lib/loader.js', import.meta.url)
+    const command = this.configManager.current.application.commands.production
 
-    this.#manager.close()
-    await exitPromise
-  }
+    this.#basePath = config.application?.basePath ? cleanBasePath(config.application?.basePath) : ''
 
-  /* c8 ignore next 5 */
-  async getWatchConfig () {
-    return {
-      enabled: false
+    if (command) {
+      return this.startWithCommand(command, loaderUrl)
     }
+
+    this.#manager = new ChildManager({
+      loader: loaderUrl,
+      context: {
+        id: this.id,
+        // Always use URL to avoid serialization problem in Windows
+        root: pathToFileURL(this.root).toString(),
+        basePath: this.#basePath,
+        logLevel: this.logger.level
+      }
+    })
+
+    this.verifyOutputDirectory(pathResolve(this.root, '.next'))
+    await this.#startProductionNext()
   }
 
-  getMeta () {
-    const deploy = this.configManager.current.deploy
-    let composer
+  async #startProductionNext () {
+    try {
+      await this.#manager.inject()
+      const { nextStart } = await importFile(pathResolve(this.#next, './dist/cli/next-start.js'))
 
-    if (this.url) {
-      composer = {
-        tcp: true,
-        url: this.url,
-        prefix: this.#basePath,
-        wantsAbsoluteUrls: true
+      const { hostname, port } = this.serverConfig ?? {}
+      const serverOptions = {
+        hostname: hostname || '127.0.0.1',
+        port: port || 0
       }
-    }
 
-    return { deploy, composer }
-  }
+      // Since we are in the same process
+      process.once('plt:next:config', config => {
+        this.#basePath = config.basePath.replace(/(^\/)|(\/$)/g, '')
+      })
 
-  async #startNext (nextRoot, serverOptions) {
-    const { nextDev } = await importFile(pathResolve(this.#next, './dist/cli/next-dev.js'))
+      this.#manager.register()
+      const serverPromise = createServerListener((this.isEntrypoint ? serverOptions?.port : undefined) ?? true)
 
-    this.#manager.inject()
-    await nextDev(serverOptions, 'default', this.root)
-    this.#manager.eject()
+      await nextStart(serverOptions, this.root)
+
+      this.#server = await serverPromise
+      this.url = getServerUrl(this.#server)
+    } finally {
+      await this.#manager.eject()
+    }
   }
 }
 

package/lib/loader.js

@@ -8,9 +8,10 @@ import {
   restElement,
   returnStatement,
   variableDeclaration,
-  variableDeclarator,
+  variableDeclarator
 } from '@babel/types'
-import { readFile } from 'node:fs/promises'
+import { readFile, realpath } from 'node:fs/promises'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 
 const originalId = '__pltOriginalNextConfig'
 
@@ -30,13 +31,17 @@ function parseSingleExpression (expr) {
       __pltOriginalNextConfig = await __pltOriginalNextConfig(...args);
     }
 
-    if(typeof __pltOriginalNextConfig === 'undefined') {
+    if(typeof __pltOriginalNextConfig.basePath === 'undefined') {
       __pltOriginalNextConfig.basePath = basePath
     }
 
-    return __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)
+
+    // This is to send the configuraion when Next is executed in the same process (production)
+    process.emit('plt:next:config', __pltOriginalNextConfig)
+
+    return __pltOriginalNextConfig;
   }
 */
 function createEvaluatorWrapperFunction (original) {
@@ -51,8 +56,9 @@ function createEvaluatorWrapperFunction (original) {
       parseSingleExpression(
         `if (typeof ${originalId}.basePath === 'undefined') { ${originalId}.basePath = "${basePath}" }`
       ),
-      parseSingleExpression(`globalThis[Symbol.for('plt.children.itc')].notify('config', ${originalId})`),
-      returnStatement(identifier(originalId)),
+      parseSingleExpression(`globalThis[Symbol.for('plt.children.itc')]?.notify('config', ${originalId})`),
+      parseSingleExpression(`process.emit('plt:next:config', ${originalId})`),
+      returnStatement(identifier(originalId))
     ]),
     false,
     true
@@ -72,7 +78,7 @@ function transformCJS (source) {
         path.node.right = createEvaluatorWrapperFunction(right)
         path.skip()
       }
-    },
+    }
   })
 
   return generate.default(ast).code
@@ -103,15 +109,21 @@ function transformESM (source) {
         // export default $EXPRESSION
         path.node.declaration = createEvaluatorWrapperFunction(declaration)
       }
-    },
+    }
   })
 
   return generate.default(ast).code
 }
 
-export function initialize (data) {
+export async function initialize (data) {
+  const realRoot = pathToFileURL(await realpath(fileURLToPath(data.root)))
+
+  if (!realRoot.pathname.endsWith('/')) {
+    realRoot.pathname += '/'
+  }
+
   // 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, data.root + '/').toString())
+  candidates = ['next.config.js', 'next.config.mjs'].map(c => new URL(c, realRoot).toString())
   basePath = data.basePath ?? ''
 }
 
@@ -123,11 +135,14 @@ export async function load (url, context, nextLoad) {
     return result
   }
 
+  url = pathToFileURL(await realpath(fileURLToPath(url))).toString()
+
   if (!candidates.includes(url)) {
     return result
   }
 
   if (result.format === 'commonjs') {
+    await readFile(new URL(result.responseURL ?? url), 'utf-8')
     result.source = transformCJS(result.source ?? (await readFile(new URL(result.responseURL ?? url), 'utf-8')))
   } else {
     result.source = transformESM(result.source)

package/lib/schema.js

@@ -1,5 +1,5 @@
 import { schemaComponents } from '@platformatic/basic'
-import { schemas as utilsSchema } from '@platformatic/utils'
+import { schemaComponents as utilsSchemaComponents } from '@platformatic/utils'
 import { readFileSync } from 'node:fs'
 
 export const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8'))
@@ -11,14 +11,13 @@ export const schema = {
   type: 'object',
   properties: {
     $schema: {
-      type: 'string',
+      type: 'string'
     },
-    server: utilsSchema.server,
+    server: utilsSchemaComponents.server,
     watch: schemaComponents.watch,
     application: schemaComponents.application,
-    deploy: schemaComponents.deploy
   },
-  additionalProperties: false,
+  additionalProperties: false
 }
 
 /* c8 ignore next 3 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "Platformatic Next.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -20,13 +20,14 @@
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.0.0-alpha.7",
-    "@platformatic/config": "2.0.0-alpha.7",
-    "@platformatic/utils": "2.0.0-alpha.7"
+    "@platformatic/basic": "2.0.0-alpha.8",
+    "@platformatic/config": "2.0.0-alpha.8",
+    "@platformatic/utils": "2.0.0-alpha.8"
   },
   "devDependencies": {
     "borp": "^0.17.0",
     "eslint": "9",
+    "fastify": "^4.28.1",
     "json-schema-to-typescript": "^15.0.1",
     "neostandard": "^0.11.1",
     "next": "^14.2.5",
@@ -34,12 +35,12 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.0.0-alpha.7",
-    "@platformatic/service": "2.0.0-alpha.7"
+    "@platformatic/composer": "2.0.0-alpha.8",
+    "@platformatic/service": "2.0.0-alpha.8"
   },
   "scripts": {
-    "test": "npm run lint && borp --concurrency=1 --timeout=180000",
-    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --timeout=180000",
+    "test": "npm run lint && borp --concurrency=1 --no-timeout",
+    "coverage": "npm run lint && borp -C -X test -X test/fixtures --concurrency=1 --no-timeout",
     "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",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.0.0-alpha.7.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.0.0-alpha.8.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Stackable",
   "type": "object",
@@ -497,13 +497,11 @@
       "properties": {
         "basePath": {
           "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
-    "deploy": {
-      "type": "object",
-      "properties": {
+        },
+        "outputDirectory": {
+          "type": "string",
+          "default": "dist"
+        },
         "include": {
           "type": "array",
           "items": {
@@ -513,19 +511,28 @@
             "dist"
           ]
         },
-        "buildCommand": {
-          "type": "string",
-          "default": "npm run build"
-        },
-        "installCommand": {
-          "type": "string",
-          "default": "npm ci --omit-dev"
-        },
-        "startCommand": {
-          "type": "string",
-          "default": "npm run start"
+        "commands": {
+          "type": "object",
+          "properties": {
+            "install": {
+              "type": "string",
+              "default": "npm ci --omit-dev"
+            },
+            "build": {
+              "type": "string"
+            },
+            "development": {
+              "type": "string"
+            },
+            "production": {
+              "type": "string"
+            }
+          },
+          "default": {},
+          "additionalProperties": false
         }
       },
+      "additionalProperties": false,
       "default": {}
     }
   },

package/test/fixtures/next/composer-autodetect-prefix/next.config.mjs

@@ -1,5 +0,0 @@
-const nextConfig = {
-  basePath: '/nested/base/dir',
-}
-
-export default nextConfig

package/test/fixtures/next/composer-autodetect-prefix/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "next",
-  "private": true,
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "next": "^14.2.5"
-  }
-}

package/test/fixtures/next/composer-autodetect-prefix/platformatic.application.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/next/2.0.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  }
-}

package/test/fixtures/next/composer-autodetect-prefix/platformatic.runtime.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "frontend",
-      "path": "."
-    },
-    { "id": "service", "config": "platformatic.service.json", "path": "../../platformatic-service" },
-    { "id": "main", "config": "platformatic.no-prefix.composer.json", "path": "../../platformatic-composer" }
-  ]
-}

package/test/fixtures/next/composer-autodetect-prefix/src/app/layout.js

@@ -1,7 +0,0 @@
-export default function RootLayout ({ children }) {
-  return (
-    <html lang='en'>
-      <body>{children}</body>
-    </html>
-  )
-}

package/test/fixtures/next/composer-autodetect-prefix/src/app/page.js

@@ -1,5 +0,0 @@
-import { version } from '../../../../../tmp/version.js'
-
-export default function Home () {
-  return <div>Hello from {version}</div>
-}

package/test/fixtures/next/composer-with-prefix/next.config.js

@@ -1 +0,0 @@
-module.exports = {}

package/test/fixtures/next/composer-with-prefix/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "next",
-  "private": true,
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "next": "^14.2.5"
-  }
-}

package/test/fixtures/next/composer-with-prefix/platformatic.application.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/next/2.0.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "application": {
-    "basePath": "/frontend"
-  }
-}

package/test/fixtures/next/composer-with-prefix/platformatic.runtime.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "frontend",
-      "path": ".",
-      "config": "platformatic.application.json"
-    },
-    { "id": "service", "config": "platformatic.service.json", "path": "../../platformatic-service" },
-    { "id": "main", "config": "platformatic.composer.json", "path": "../../platformatic-composer" }
-  ]
-}

package/test/fixtures/next/composer-with-prefix/src/app/layout.js

@@ -1,7 +0,0 @@
-export default function RootLayout ({ children }) {
-  return (
-    <html lang='en'>
-      <body>{children}</body>
-    </html>
-  )
-}

package/test/fixtures/next/composer-with-prefix/src/app/page.js

@@ -1,5 +0,0 @@
-import { version } from '../../../../../tmp/version.js'
-
-export default function Home () {
-  return <div>Hello from {version}</div>
-}

package/test/fixtures/next/composer-without-prefix/next.config.mjs

@@ -1,3 +0,0 @@
-export default function () {
-  return {}
-}

package/test/fixtures/next/composer-without-prefix/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "next",
-  "private": true,
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "next": "^14.2.5"
-  }
-}

package/test/fixtures/next/composer-without-prefix/platformatic.application.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/next/2.0.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  }
-}

package/test/fixtures/next/composer-without-prefix/platformatic.runtime.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "frontend",
-      "path": ".",
-      "config": "platformatic.application.json"
-    },
-    { "id": "service", "config": "platformatic.service.json", "path": "../../platformatic-service" },
-    { "id": "main", "config": "platformatic.no-prefix.composer.json", "path": "../../platformatic-composer" }
-  ]
-}

package/test/fixtures/next/composer-without-prefix/src/app/layout.js

@@ -1,7 +0,0 @@
-export default function RootLayout ({ children }) {
-  return (
-    <html lang='en'>
-      <body>{children}</body>
-    </html>
-  )
-}

package/test/fixtures/next/composer-without-prefix/src/app/page.js

@@ -1,5 +0,0 @@
-import { version } from '../../../../../tmp/version.js'
-
-export default function Home () {
-  return <div>Hello from {version}</div>
-}

package/test/fixtures/next/server-side/next.config.js

@@ -1 +0,0 @@
-module.exports = {}

package/test/fixtures/next/server-side/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "next",
-  "private": true,
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "next": "^14.2.5"
-  }
-}

package/test/fixtures/next/server-side/platformatic.application.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/next/2.0.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "application": {
-    "basePath": "/frontend"
-  }
-}

package/test/fixtures/next/server-side/platformatic.runtime.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "frontend",
-      "path": ".",
-      "config": "platformatic.application.json"
-    },
-    { "id": "service", "config": "platformatic.service.json", "path": "../../platformatic-service" },
-    { "id": "main", "config": "platformatic.composer.json", "path": "../../platformatic-composer" }
-  ]
-}

package/test/fixtures/next/server-side/src/app/direct/route.js

@@ -1,3 +0,0 @@
-export async function GET () {
-  return Response.json({ ok: true })
-}

package/test/fixtures/next/server-side/src/app/layout.js

@@ -1,7 +0,0 @@
-export default function RootLayout ({ children }) {
-  return (
-    <html lang='en'>
-      <body>{children}</body>
-    </html>
-  )
-}

package/test/fixtures/next/server-side/src/app/page.js

@@ -1,12 +0,0 @@
-import { version } from '../../../../../tmp/version.js'
-
-export default async function Home () {
-  const response = await fetch('http://service.plt.local/time')
-  const { time } = await response.json()
-
-  return (
-    <div>
-      Hello from v{version} t{time}
-    </div>
-  )
-}

package/test/fixtures/next/standalone/next.config.mjs

@@ -1,3 +0,0 @@
-const nextConfig = {}
-
-export default nextConfig

package/test/fixtures/next/standalone/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "next",
-  "private": true,
-  "version": "0.1.0",
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "next": "^14.2.5"
-  }
-}

package/test/fixtures/next/standalone/platformatic.runtime.json

@@ -1,18 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
-  "entrypoint": "main",
-  "watch": false,
-  "managementApi": false,
-  "metrics": false,
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "services": [
-    {
-      "id": "main",
-      "path": "."
-    }
-  ]
-}

package/test/fixtures/next/standalone/src/app/layout.js

@@ -1,7 +0,0 @@
-export default function RootLayout ({ children }) {
-  return (
-    <html lang='en'>
-      <body>{children}</body>
-    </html>
-  )
-}

package/test/fixtures/next/standalone/src/app/page.js

@@ -1,5 +0,0 @@
-import { version } from '../../../../../tmp/version.js'
-
-export default function Home () {
-  return <div>Hello from {version}</div>
-}

package/test/fixtures/platformatic-composer/platformatic.composer.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/composer/1.52.0.json",
-  "composer": {
-    "services": [
-      {
-        "id": "frontend"
-      },
-      {
-        "id": "service"
-      }
-    ]
-  },
-  "plugins": {
-    "paths": [
-      {
-        "path": "./plugin.js"
-      }
-    ]
-  }
-}

package/test/fixtures/platformatic-composer/platformatic.no-prefix.composer.json

@@ -1,23 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/composer/1.52.0.json",
-  "composer": {
-    "services": [
-      {
-        "id": "frontend",
-        "proxy": {
-          "prefix": ""
-        }
-      },
-      {
-        "id": "service"
-      }
-    ]
-  },
-  "plugins": {
-    "paths": [
-      {
-        "path": "./plugin.js"
-      }
-    ]
-  }
-}

package/test/fixtures/platformatic-composer/plugin.js

@@ -1,9 +0,0 @@
-export default async function (app) {
-  app.get('/plugin', async () => {
-    return { ok: true }
-  })
-
-  app.get('/frontend/plugin', async () => {
-    return { ok: true }
-  })
-}

package/test/fixtures/platformatic-service/platformatic.service.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://schemas.platformatic.dev/@platformatic/service/1.52.0.json",
-  "server": {
-    "logger": {
-      "level": "error"
-    }
-  },
-  "plugins": {
-    "paths": [
-      {
-        "path": "./plugin.js"
-      }
-    ]
-  }
-}

package/test/fixtures/platformatic-service/plugin.js

@@ -1,19 +0,0 @@
-'use strict'
-
-export default async function (app) {
-  app.get('/mesh', async () => {
-    const meta = await globalThis[Symbol.for('plt.runtime.itc')].send('getServiceMeta', 'frontend')
-
-    const url = new URL(`${meta.composer.prefix}/direct`.replaceAll(/\/+/g, '/'), 'http://frontend.plt.local')
-    const response = await fetch(url)
-    return response.json()
-  })
-
-  app.get('/direct', async () => {
-    return { ok: true }
-  })
-
-  app.get('/time', async () => {
-    return { time: Date.now() }
-  })
-}

package/test/index.test.js

@@ -1,132 +0,0 @@
-import { dirname, resolve } from 'node:path'
-import { test } from 'node:test'
-import {
-  createRuntime,
-  fixturesDir,
-  setFixturesDir,
-  updateHMRVersion,
-  verifyHMR,
-  verifyHTMLViaHTTP,
-  verifyHTMLViaInject,
-  verifyJSONViaHTTP,
-  verifyJSONViaInject,
-} from '../../basic/test/helper.js'
-import { safeRemove } from '../../utils/index.js'
-
-function websocketHMRHandler (message, resolveConnection, resolveReload) {
-  switch (message.action) {
-    case 'sync':
-      resolveConnection()
-      break
-    case 'serverComponentChanges':
-      resolveReload()
-  }
-}
-
-function cleanNext (configFile) {
-  const root = dirname(resolve(fixturesDir, configFile))
-  return safeRemove(resolve(root, '.next'))
-}
-
-const packageRoot = resolve(import.meta.dirname, '..')
-setFixturesDir(resolve(import.meta.dirname, './fixtures'))
-
-test('can detect and start a Next application', async t => {
-  await updateHMRVersion()
-  await cleanNext('next/standalone/platformatic.runtime.json')
-
-  const { url } = await createRuntime(t, 'next/standalone/platformatic.runtime.json', packageRoot)
-
-  await verifyHTMLViaHTTP(url, '/', ['<script src="/_next/static/chunks/main-app.js'])
-  await verifyHMR(url, '/_next/webpack-hmr', undefined, websocketHMRHandler)
-})
-
-test('can detect and start a Next application when exposed in a composer with a prefix', async t => {
-  await updateHMRVersion()
-  await cleanNext('next/composer-with-prefix/platformatic.runtime.json')
-
-  const { runtime, url } = await createRuntime(t, 'next/composer-with-prefix/platformatic.runtime.json', packageRoot)
-
-  const htmlContents = ['<script src="/frontend/_next/static/chunks/main-app.js']
-
-  await verifyHTMLViaHTTP(url, '/frontend/', htmlContents)
-  await verifyHTMLViaInject(runtime, 'main', '/frontend', htmlContents)
-  await verifyHMR(url, '/frontend/_next/webpack-hmr', undefined, websocketHMRHandler)
-
-  await verifyJSONViaHTTP(url, '/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/service/direct', 200, { ok: true })
-
-  await verifyJSONViaInject(runtime, 'main', 'GET', 'plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'service', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start a Next application when exposed in a composer without a prefix', async t => {
-  await updateHMRVersion()
-  await cleanNext('next/composer-without-prefix/platformatic.runtime.json')
-
-  const { runtime, url } = await createRuntime(t, 'next/composer-without-prefix/platformatic.runtime.json', packageRoot)
-
-  const htmlContents = ['<script src="/_next/static/chunks/main-app.js']
-
-  await verifyHTMLViaHTTP(url, '/', htmlContents)
-  await verifyHTMLViaInject(runtime, 'main', '/', htmlContents)
-  await verifyHMR(url, '/_next/webpack-hmr', undefined, websocketHMRHandler)
-
-  await verifyJSONViaHTTP(url, '/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/service/direct', 200, { ok: true })
-
-  await verifyJSONViaInject(runtime, 'main', 'GET', 'plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'service', 'GET', '/direct', 200, { ok: true })
-})
-
-// In this file the application purposely does not specify a platformatic.application.json to see if we automatically detect one
-test('can detect and start a Next application when exposed in a composer with a custom config and by autodetecting the prefix', async t => {
-  await updateHMRVersion()
-  await cleanNext('next/composer-autodetect-prefix/platformatic.runtime.json')
-
-  const { runtime, url } = await createRuntime(
-    t,
-    'next/composer-autodetect-prefix/platformatic.runtime.json',
-    packageRoot
-  )
-
-  const htmlContents = ['<script src="/nested/base/dir/_next/static/chunks/main-app.js']
-
-  await verifyHTMLViaHTTP(url, '/nested/base/dir/', htmlContents)
-  await verifyHTMLViaInject(runtime, 'main', '/nested/base/dir', htmlContents)
-  await verifyHMR(url, '/nested/base/dir/_next/webpack-hmr', undefined, websocketHMRHandler)
-
-  await verifyJSONViaHTTP(url, '/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/service/direct', 200, { ok: true })
-
-  await verifyJSONViaInject(runtime, 'main', 'GET', 'plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'service', 'GET', '/direct', 200, { ok: true })
-})
-
-test('can detect and start a Next application with working React Server Components and Next server API', async t => {
-  await updateHMRVersion()
-  await cleanNext('next/server-side/platformatic.runtime.json')
-  const { runtime, url } = await createRuntime(t, 'next/server-side/platformatic.runtime.json', packageRoot)
-
-  const htmlContents = ['<script src="/frontend/_next/static/chunks/main-app.js']
-
-  await verifyHTMLViaHTTP(url, '/frontend/', htmlContents)
-  await verifyHTMLViaInject(runtime, 'main', '/frontend', htmlContents)
-  await verifyHMR(url, '/frontend/_next/webpack-hmr', undefined, websocketHMRHandler)
-
-  await verifyJSONViaHTTP(url, '/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/service/direct', 200, { ok: true })
-  await verifyJSONViaHTTP(url, '/service/mesh', 200, { ok: true })
-
-  await verifyJSONViaInject(runtime, 'main', 'GET', 'plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'main', 'GET', '/frontend/plugin', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'service', 'GET', '/direct', 200, { ok: true })
-  await verifyJSONViaInject(runtime, 'service', 'GET', '/mesh', 200, { ok: true })
-})