create-platformatic 1.10.0 → 1.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Create platformatic-db interactive tool",
   "repository": {
     "type": "git",
@@ -15,6 +15,7 @@
   "license": "Apache-2.0",
   "author": "Marco Piraccini <marco.piraccini@gmail.com>",
   "dependencies": {
+    "@types/node": "^20.8.10",
     "boring-name-generator": "^1.0.3",
     "chalk": "^5.3.0",
     "columnify": "^1.6.0",
@@ -35,7 +36,7 @@
     "strip-ansi": "^7.1.0",
     "undici": "^5.25.4",
     "which": "^3.0.1",
-    "@platformatic/config": "1.10.0"
+    "@platformatic/config": "1.11.0"
   },
   "devDependencies": {
     "ajv": "^8.12.0",
@@ -48,8 +49,8 @@
     "tap": "^16.3.9",
     "typescript": "~5.2.2",
     "yaml": "^2.3.2",
-    "@platformatic/db": "1.10.0",
-    "@platformatic/service": "1.10.0"
+    "@platformatic/db": "1.11.0",
+    "@platformatic/service": "1.11.0"
   },
   "scripts": {
     "test:cli": "tap --no-coverage test/cli/*test.mjs -t120",

package/src/runtime/create-runtime-cli.mjs

@@ -99,7 +99,7 @@ export async function createPlatformaticRuntime (_args) {
   if (addTypescriptDevDep) {
     const typescriptVersion = await getDependencyVersion('typescript')
     devDependencies.typescript = `^${typescriptVersion}`
-    devDependencies['@types/node'] = 'latest'
+    devDependencies['@types/node'] = await getDependencyVersion('@types/node')
   }
 
   // Create the package.json, notes that we don't have the option for TS (yet) so we don't generate

package/src/utils.mjs

@@ -4,10 +4,13 @@ import { resolve, join, dirname } from 'path'
 import { createRequire } from 'module'
 import semver from 'semver'
 import * as desm from 'desm'
+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))
 
 export async function isFileAccessible (filename, directory) {
   try {
@@ -73,21 +76,44 @@ export const findRuntimeConfigFile = async (directory) => (ConfigManager.findCon
  * @returns string
  */
 export const getDependencyVersion = async (dependencyName) => {
-  const require = createRequire(import.meta.url)
-  let dependencyPath = dirname(require.resolve(dependencyName))
-  // some deps are resolved not at their root level
-  // for instance 'typescript' will be risolved in its own ./lib directory
-  // next loop is to find the nearest parent directory that contains a package.json file
-  while (!await isFileAccessible(join(dependencyPath, 'package.json'))) {
-    dependencyPath = join(dependencyPath, '..')
-    if (dependencyPath === '/') {
-      throw new Error(`Cannot find package.json for ${dependencyName}`)
+  const rootPackageJson = join(__dirname, '..', 'package.json')
+  const packageJsonContents = JSON.parse(await readFile(rootPackageJson, 'utf8'))
+  const dependencies = packageJsonContents.dependencies
+  const devDependencies = packageJsonContents.devDependencies
+  const regexp = /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)/
+  if (dependencies[dependencyName]) {
+    const match = dependencies[dependencyName].match(regexp)
+    if (!match) {
+      return await resolveWorkspaceDependency(dependencyName)
+    }
+    return match[0]
+  }
+
+  if (devDependencies[dependencyName]) {
+    const match = devDependencies[dependencyName].match(regexp)
+    if (!match) {
+      return await resolveWorkspaceDependency(dependencyName)
+    }
+    return match[0]
+  }
+
+  async function resolveWorkspaceDependency (dependencyName) {
+    const require = createRequire(import.meta.url)
+    let dependencyPath = dirname(require.resolve(dependencyName))
+    // some deps are resolved not at their root level
+    // for instance 'typescript' will be risolved in its own ./lib directory
+    // next loop is to find the nearest parent directory that contains a package.json file
+    while (!await isFileAccessible(join(dependencyPath, 'package.json'))) {
+      dependencyPath = join(dependencyPath, '..')
+      if (dependencyPath === '/') {
+        throw new Error(`Cannot find package.json for ${dependencyName}`)
+      }
     }
+    const pathToPackageJson = join(dependencyPath, 'package.json')
+    const packageJsonFile = await readFile(pathToPackageJson, 'utf-8')
+    const packageJson = JSON.parse(packageJsonFile)
+    return packageJson.version
   }
-  const pathToPackageJson = join(dependencyPath, 'package.json')
-  const packageJsonFile = await readFile(pathToPackageJson, 'utf-8')
-  const packageJson = JSON.parse(packageJsonFile)
-  return packageJson.version
 }
 
 export const minimumSupportedNodeVersions = ['18.8.0', '20.6.0']