create-platformatic 2.72.0 → 3.0.0-alpha.1

package/{create-platformatic.mjs → bin/create-platformatic.mjs}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { checkNodeVersionForServices } from '@platformatic/utils'
-import { join } from 'desm'
 import isMain from 'es-main'
 import { readFile } from 'fs/promises'
 import parseArgs from 'minimist'
-import { createPlatformatic } from './src/index.mjs'
+import { join } from 'node:path'
+import { createPlatformatic } from '../src/index.mjs'
 
 if (isMain(import.meta)) {
   checkNodeVersionForServices()
@@ -17,11 +17,11 @@ if (isMain(import.meta)) {
   })
 
   if (args.version) {
-    console.log('v' + JSON.parse(await readFile(join(import.meta.url, 'package.json'), 'utf8')).version)
+    console.log('v' + JSON.parse(await readFile(join(import.meta.dirname, 'package.json'), 'utf8')).version)
     process.exit(0)
   }
   await createPlatformatic(_args)
 }
 
-export * from './src/index.mjs'
-export * from './src/utils.mjs'
+export * from '../src/index.mjs'
+export * from '../src/utils.mjs'

package/package.json

@@ -1,23 +1,22 @@
 {
   "name": "create-platformatic",
-  "version": "2.72.0",
+  "version": "3.0.0-alpha.1",
   "description": "Create platformatic application interactive tool",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/platformatic/platformatic.git"
   },
   "exports": {
-    ".": "./create-platformatic.mjs"
+    ".": "./bin/create-platformatic.mjs"
   },
   "bin": {
-    "create-platformatic": "./create-platformatic.mjs"
+    "create-platformatic": "./bin/create-platformatic.mjs"
   },
   "license": "Apache-2.0",
   "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",
   "dependencies": {
     "columnify": "^1.6.0",
     "commist": "^3.2.0",
-    "desm": "^1.3.1",
     "es-main": "^1.3.0",
     "execa": "^9.0.0",
     "help-me": "^5.0.0",
@@ -31,9 +30,8 @@
     "strip-ansi": "^7.1.0",
     "undici": "^7.0.0",
     "which": "^3.0.1",
-    "@platformatic/generators": "2.72.0",
-    "@platformatic/utils": "2.72.0",
-    "@platformatic/config": "2.72.0"
+    "@platformatic/generators": "3.0.0-alpha.1",
+    "@platformatic/utils": "3.0.0-alpha.1"
   },
   "devDependencies": {
     "@types/node": "^22.5.0",
@@ -48,10 +46,10 @@
     "neostandard": "^0.12.0",
     "typescript": "~5.8.0",
     "yaml": "^2.4.1",
-    "@platformatic/composer": "2.72.0",
-    "@platformatic/db": "2.72.0",
-    "@platformatic/runtime": "2.72.0",
-    "@platformatic/service": "2.72.0"
+    "@platformatic/composer": "3.0.0-alpha.1",
+    "@platformatic/db": "3.0.0-alpha.1",
+    "@platformatic/service": "3.0.0-alpha.1",
+    "@platformatic/runtime": "3.0.0-alpha.1"
   },
   "scripts": {
     "test:cli": "borp --pattern \"test/cli/*test.mjs\" --timeout=1200000 --concurrency=1",

package/src/index.mjs

@@ -1,15 +1,14 @@
-import ConfigManager, { findConfigurationFile, loadConfigurationFile } from '@platformatic/config'
 import { ImportGenerator } from '@platformatic/generators'
 import {
-  getPackageManager, DEFAULT_PACKAGE_MANAGER,
   createDirectory,
   detectApplicationType,
   executeWithTimeout,
+  findConfigurationFileRecursive,
   generateDashedName,
   getPkgManager,
+  loadConfigurationFile,
   searchJavascriptFiles
 } from '@platformatic/utils'
-
 import { execa } from 'execa'
 import defaultInquirer from 'inquirer'
 import parseArgs from 'minimist'
@@ -23,8 +22,7 @@ import pretty from 'pino-pretty'
 import resolveModule from 'resolve'
 import { request } from 'undici'
 import { createGitRepository } from './create-git-repository.mjs'
-import { getUsername, getVersion, say } from './utils.mjs'
-
+import { findComposerConfigFile, getUsername, getVersion, say } from './utils.mjs'
 const MARKETPLACE_HOST = 'https://marketplace.platformatic.dev'
 const defaultStackables = ['@platformatic/service', '@platformatic/composer', '@platformatic/db']
 
@@ -234,7 +232,7 @@ export async function createApplication (
   // Check in the directory and its parents if there is a config file
   let shouldChooseProjectDir = true
   let projectDir = process.cwd()
-  const runtimeConfigFile = await findConfigurationFile(projectDir, null, 'runtime')
+  const runtimeConfigFile = await findConfigurationFileRecursive(projectDir, null, '@platformatic/runtime')
 
   if (runtimeConfigFile) {
     shouldChooseProjectDir = false
@@ -249,11 +247,11 @@ export async function createApplication (
 
       // Check if the file belongs to a Watt application, this can happen for instance if we executed watt create
       // in the services folder
-      const existingRuntime = await findConfigurationFile(applicationRoot, null, 'runtime')
+      const existingRuntime = await findConfigurationFileRecursive(applicationRoot, null, '@platformatic/runtime')
 
       if (!existingRuntime) {
         // If there is a watt.json file with a runtime property, we assume we already executed watt create and we exit.
-        const existingService = await ConfigManager.findConfigFile(projectDir)
+        const existingService = await findComposerConfigFile(projectDir)
 
         if (existingService) {
           const serviceConfig = await loadConfigurationFile(existingService)
@@ -276,10 +274,6 @@ export async function createApplication (
         })
 
         if (shouldWrap) {
-          if (!packageManager) {
-            packageManager = getPackageManager(projectDir, DEFAULT_PACKAGE_MANAGER)
-          }
-
           return wrapApplication(
             logger,
             inquirer,
@@ -313,26 +307,6 @@ export async function createApplication (
 
   const projectName = basename(projectDir)
 
-  if (!packageManager) {
-    packageManager = getPackageManager(projectDir, null, true)
-
-    if (!packageManager) {
-      const p = await inquirer.prompt({
-        type: 'list',
-        name: 'packageManager',
-        message: 'Which package manager do you want to use?',
-        default: DEFAULT_PACKAGE_MANAGER,
-        choices: [
-          { name: 'npm', value: 'npm' },
-          { name: 'pnpm', value: 'pnpm' },
-          { name: 'yarn', value: 'yarn' }
-        ]
-      })
-
-      packageManager = p.packageManager
-    }
-  }
-
   const runtime = await importOrLocal({
     pkgManager: packageManager,
     name: projectName,
@@ -344,7 +318,6 @@ export async function createApplication (
     logger,
     name: projectName,
     inquirer,
-    packageManager,
     ...additionalGeneratorOptions
   })
 

package/src/utils.mjs

@@ -1,12 +1,10 @@
-import * as desm from 'desm'
+import { findConfigurationFile } from '@platformatic/utils'
 import { execa } from 'execa'
 import { access, constants, readFile } from 'fs/promises'
 import { createRequire } from 'module'
 import { dirname, join, resolve } from 'path'
 import * as url from 'url'
 
-import ConfigManager from '@platformatic/config'
-
 export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 export const randomBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min)
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
@@ -16,7 +14,7 @@ const ansiCodes = {
   pltGreen: '\u001B[38;2;33;250;144m',
   bell: '\u0007',
   reset: '\u001b[0m',
-  erasePreviousLine: '\u001b[1K',
+  erasePreviousLine: '\u001b[1K'
 }
 
 export async function isFileAccessible (filename, directory) {
@@ -58,7 +56,7 @@ export const getUsername = async () => {
  */
 /* c8 ignore next 4 */
 export const getVersion = async () => {
-  const data = await readFile(desm.join(import.meta.url, '..', 'package.json'), 'utf8')
+  const data = await readFile(join(import.meta.dirname, '..', 'package.json'), 'utf8')
   return JSON.parse(data).version
 }
 
@@ -71,11 +69,11 @@ export async function isDirectoryWriteable (directory) {
   }
 }
 
-export const findConfigFile = async directory => ConfigManager.findConfigFile(directory)
-export const findDBConfigFile = async directory => ConfigManager.findConfigFile(directory, 'db')
-export const findServiceConfigFile = async directory => ConfigManager.findConfigFile(directory, 'service')
-export const findComposerConfigFile = async directory => ConfigManager.findConfigFile(directory, 'composer')
-export const findRuntimeConfigFile = async directory => ConfigManager.findConfigFile(directory, 'runtime')
+export const findConfigFile = async directory => findConfigurationFile(directory)
+export const findDBConfigFile = async directory => findConfigurationFile(directory, 'db')
+export const findServiceConfigFile = async directory => findConfigurationFile(directory, 'service')
+export const findComposerConfigFile = async directory => findConfigurationFile(directory, 'composer')
+export const findRuntimeConfigFile = async directory => findConfigurationFile(directory, 'runtime')
 
 /**
  * Gets the version of the specified dependency package from package.json