wattpm 2.23.0 → 2.25.0

package/lib/commands/build.js

@@ -8,6 +8,7 @@ import { resolve } from 'node:path'
 import {
   buildRuntime,
   findConfigurationFile,
+  getPackageArgs,
   getPackageManager,
   getRoot,
   loadConfigurationFile,
@@ -45,18 +46,7 @@ export async function installDependencies (logger, root, services, production, p
     packageManager = getPackageManager(root)
   }
 
-  const args = ['install']
-
-  if (production) {
-    switch (packageManager) {
-      case 'pnpm':
-        args.push('--prod')
-        break
-      case 'npm':
-        args.push('--omit=dev')
-        break
-    }
-  }
+  const args = getPackageArgs(packageManager, production)
 
   // Install dependencies of the application
   try {
@@ -71,12 +61,19 @@ export async function installDependencies (logger, root, services, production, p
   }
 
   for (const service of services) {
+    /* c8 ignore next */
+    const servicePackageManager = service.packageManager ?? getPackageManager(service.path) ?? packageManager
+    const servicePackageArgs = getPackageArgs(servicePackageManager, production)
+
     try {
       logger.info(
-        `Installing ${production ? 'production ' : ''}dependencies for the service ${bold(service.id)} using ${packageManager} ...`
+        `Installing ${production ? 'production ' : ''}dependencies for the service ${bold(service.id)} using ${servicePackageManager} ...`
       )
 
-      await executeCommand(root, packageManager, args, { cwd: resolve(root, service.path), stdio: 'inherit' })
+      await executeCommand(root, servicePackageManager, servicePackageArgs, {
+        cwd: resolve(root, service.path),
+        stdio: 'inherit'
+      })
       /* c8 ignore next 6 */
     } catch (error) {
       logger.fatal(

package/lib/commands/external.js

@@ -10,7 +10,6 @@ import { defaultServiceJson } from '../defaults.js'
 import { version } from '../schema.js'
 import {
   findConfigurationFile,
-  getPackageManager,
   getRoot,
   loadConfigurationFile,
   loadRawConfigurationFile,
@@ -254,10 +253,6 @@ export async function resolveServices (
 ) {
   const config = await loadConfigurationFile(logger, configurationFile)
 
-  if (!packageManager) {
-    getPackageManager(root)
-  }
-
   // The services which might be to be resolved are the one that have a URL and either
   // no path defined (which means no environment variable set) or a non-existing path (which means not resolved yet)
   const resolvableServices = config.services.filter(service => {
@@ -321,7 +316,7 @@ export async function resolveServices (
         url = parsed.toString()
       }
 
-      const cloneArgs = ['clone', url, absolutePath]
+      const cloneArgs = ['clone', url, absolutePath, '--single-branch', '--depth', 1]
 
       let branchLabel = ''
       if (service.gitBranch && service.gitBranch !== 'main') {
@@ -433,7 +428,7 @@ export async function resolveCommand (logger, args) {
       },
       'package-manager': {
         type: 'string',
-        short: 'p'
+        short: 'P'
       }
     },
     false

package/lib/commands/init.js

@@ -74,7 +74,7 @@ export async function initCommand (logger, args) {
     fixPaths: false
   })
 
-  await configManager.parse()
+  await configManager.parse(true, [], { transformOnValidationErrors: true })
 
   await saveConfigurationFile(logger, configurationFile, {
     $schema: schema.$id,

package/lib/utils.js

@@ -8,9 +8,9 @@ import {
 import { errors } from '@platformatic/control'
 import { platformaticRuntime, buildRuntime as pltBuildRuntime } from '@platformatic/runtime'
 import { bgGreen, black, bold } from 'colorette'
+import { existsSync } from 'node:fs'
 import { readFile, writeFile } from 'node:fs/promises'
 import { dirname, resolve } from 'node:path'
-import { existsSync } from 'node:fs'
 import { parseArgs as nodeParseArgs } from 'node:util'
 import { pino } from 'pino'
 import pinoPretty from 'pino-pretty'
@@ -99,6 +99,21 @@ export function getPackageManager (root) {
   return 'npm'
 }
 
+export function getPackageArgs (packageManager, production) {
+  const args = ['install']
+  if (production) {
+    switch (packageManager) {
+      case 'pnpm':
+        args.push('--prod')
+        break
+      case 'npm':
+        args.push('--omit=dev')
+        break
+    }
+  }
+  return args
+}
+
 export function getRoot (positionals) {
   let root = process.cwd()
 
@@ -191,7 +206,7 @@ export async function loadConfigurationFile (logger, configurationFile) {
     }
   })
 
-  await configManager.parse(true, [])
+  await configManager.parse(true, [], { transformOnValidationErrors: true })
   return configManager.current
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattpm",
-  "version": "2.23.0",
+  "version": "2.25.0",
   "description": "The Node.js Application Server",
   "main": "index.js",
   "type": "module",
@@ -35,11 +35,11 @@
     "pino-pretty": "^13.0.0",
     "split2": "^4.2.0",
     "table": "^6.8.2",
-    "@platformatic/basic": "2.23.0",
-    "@platformatic/control": "2.23.0",
-    "@platformatic/config": "2.23.0",
-    "@platformatic/runtime": "2.23.0",
-    "@platformatic/utils": "2.23.0"
+    "@platformatic/basic": "2.25.0",
+    "@platformatic/runtime": "2.25.0",
+    "@platformatic/utils": "2.25.0",
+    "@platformatic/control": "2.25.0",
+    "@platformatic/config": "2.25.0"
   },
   "devDependencies": {
     "borp": "^0.19.0",
@@ -49,7 +49,7 @@
     "neostandard": "^0.12.0",
     "typescript": "^5.5.4",
     "undici": "^7.0.0",
-    "@platformatic/node": "2.23.0"
+    "@platformatic/node": "2.25.0"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/wattpm/2.23.0.json",
+  "$id": "https://schemas.platformatic.dev/wattpm/2.25.0.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
@@ -313,6 +313,14 @@
           "sourceMaps": {
             "type": "boolean",
             "default": false
+          },
+          "packageManager": {
+            "type": "string",
+            "enum": [
+              "npm",
+              "pnpm",
+              "yarn"
+            ]
           }
         }
       }
@@ -483,6 +491,14 @@
           "sourceMaps": {
             "type": "boolean",
             "default": false
+          },
+          "packageManager": {
+            "type": "string",
+            "enum": [
+              "npm",
+              "pnpm",
+              "yarn"
+            ]
           }
         }
       }