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

package/config.d.ts

@@ -153,4 +153,11 @@ export interface PlatformaticNextJsStackable {
   application?: {
     basePath?: string;
   };
+  deploy?: {
+    include?: string[];
+    buildCommand?: string;
+    installCommand?: string;
+    startCommand?: string;
+    [k: string]: unknown;
+  };
 }

package/index.js

@@ -1,4 +1,11 @@
-import { BaseStackable, ChildManager, errors, importFile } from '@platformatic/basic'
+import {
+  BaseStackable,
+  transformConfig as basicTransformConfig,
+  ChildManager,
+  errors,
+  importFile,
+  schemaOptions
+} from '@platformatic/basic'
 import { ConfigManager } from '@platformatic/config'
 import { once } from 'node:events'
 import { readFile } from 'node:fs/promises'
@@ -20,8 +27,6 @@ export class NextStackable extends BaseStackable {
   }
 
   async init () {
-    globalThis[Symbol.for('plt.runtime.itc')].handle('getServiceMeta', this.getMeta.bind(this))
-
     this.#next = pathResolve(dirname(createRequire(this.root).resolve('next')), '../..')
     const nextPackage = JSON.parse(await readFile(pathResolve(this.#next, 'package.json'), 'utf-8'))
 
@@ -44,7 +49,7 @@ export class NextStackable extends BaseStackable {
     const { hostname, port } = this.serverConfig ?? {}
     const serverOptions = {
       host: hostname || '127.0.0.1',
-      port: port || 0,
+      port: port || 0
     }
 
     this.#basePath = config.application?.basePath
@@ -57,8 +62,8 @@ export class NextStackable extends BaseStackable {
         // Always use URL to avoid serialization problem in Windows
         root: pathToFileURL(this.root),
         basePath: this.#basePath,
-        logger: { id: this.id, level: this.logger.level },
-      },
+        logger: { id: this.id, level: this.logger.level }
+      }
     })
 
     this.#manager.on('config', config => {
@@ -80,19 +85,24 @@ export class NextStackable extends BaseStackable {
   /* c8 ignore next 5 */
   async getWatchConfig () {
     return {
-      enabled: false,
+      enabled: false
     }
   }
 
   getMeta () {
-    return {
-      composer: {
+    const deploy = this.configManager.current.deploy
+    let composer
+
+    if (this.url) {
+      composer = {
         tcp: true,
         url: this.url,
         prefix: this.#basePath,
-        wantsAbsoluteUrls: true,
-      },
+        wantsAbsoluteUrls: true
+      }
     }
+
+    return { deploy, composer }
   }
 
   async #startNext (nextRoot, serverOptions) {
@@ -113,12 +123,14 @@ function transformConfig () {
   if (typeof this.current.watch !== 'object') {
     this.current.watch = { enabled: this.current.watch || false }
   }
+
+  basicTransformConfig.call(this)
 }
 
 export async function buildStackable (opts) {
   const root = opts.context.directory
 
-  const configManager = new ConfigManager({ schema, source: opts.config ?? {}, transformConfig })
+  const configManager = new ConfigManager({ schema, source: opts.config ?? {}, schemaOptions, transformConfig })
   await configManager.parseAndValidate()
 
   return new NextStackable(opts, root, configManager)
@@ -127,9 +139,10 @@ export async function buildStackable (opts) {
 export default {
   configType: 'next',
   configManagerConfig: {
-    transformConfig,
+    schemaOptions,
+    transformConfig
   },
   buildStackable,
   schema,
-  version: packageJson.version,
+  version: packageJson.version
 }

package/lib/schema.js

@@ -16,6 +16,7 @@ export const schema = {
     server: utilsSchema.server,
     watch: schemaComponents.watch,
     application: schemaComponents.application,
+    deploy: schemaComponents.deploy
   },
   additionalProperties: false,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/next",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "description": "Platformatic Next.js Stackable",
   "main": "index.js",
   "type": "module",
@@ -20,22 +20,22 @@
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
     "semver": "^7.6.3",
-    "@platformatic/basic": "2.0.0-alpha.5",
-    "@platformatic/utils": "2.0.0-alpha.5",
-    "@platformatic/config": "2.0.0-alpha.5"
+    "@platformatic/basic": "2.0.0-alpha.7",
+    "@platformatic/config": "2.0.0-alpha.7",
+    "@platformatic/utils": "2.0.0-alpha.7"
   },
   "devDependencies": {
     "borp": "^0.17.0",
     "eslint": "9",
+    "json-schema-to-typescript": "^15.0.1",
     "neostandard": "^0.11.1",
     "next": "^14.2.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "json-schema-to-typescript": "^15.0.0",
     "typescript": "^5.5.4",
     "ws": "^8.18.0",
-    "@platformatic/composer": "2.0.0-alpha.5",
-    "@platformatic/service": "2.0.0-alpha.5"
+    "@platformatic/composer": "2.0.0-alpha.7",
+    "@platformatic/service": "2.0.0-alpha.7"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=180000",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.0.0-alpha.5.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/next/2.0.0-alpha.7.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Next.js Stackable",
   "type": "object",
@@ -500,6 +500,33 @@
         }
       },
       "additionalProperties": false
+    },
+    "deploy": {
+      "type": "object",
+      "properties": {
+        "include": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [
+            "dist"
+          ]
+        },
+        "buildCommand": {
+          "type": "string",
+          "default": "npm run build"
+        },
+        "installCommand": {
+          "type": "string",
+          "default": "npm ci --omit-dev"
+        },
+        "startCommand": {
+          "type": "string",
+          "default": "npm run start"
+        }
+      },
+      "default": {}
     }
   },
   "additionalProperties": false

package/test/index.test.js

@@ -123,6 +123,7 @@ test('can detect and start a Next application with working React Server Componen
   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 })