@capgo/cli 4.12.1 → 4.12.3-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.12.1",
+  "version": "4.12.3-beta.0",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -61,7 +61,6 @@
     "ky": "^1.3.0",
     "logsnag": "1.0.0",
     "mime": "^4.0.3",
-    "node-dir": "^0.1.17",
     "open": "^10.1.0",
     "prettyjson": "^1.2.5",
     "semver": "^7.6.2",
@@ -72,7 +71,6 @@
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^4.0.0",
     "@types/node": "^20.14.7",
-    "@types/node-dir": "^0.0.37",
     "@types/npmcli__ci-detect": "^2.0.3",
     "@types/prettyjson": "^0.0.33",
     "@types/prompt-sync": "^4.2.3",

package/src/bundle/upload.ts

@@ -343,7 +343,8 @@ async function uploadBundleToCapgoCloud(supabase: SupabaseType, appid: string, b
 
 async function setVersionInChannel(
   supabase: SupabaseType,
-  options: Options,
+  apikey: string,
+  displayBundleUrl: boolean,
   bundle: string,
   channel: string,
   userId: string,
@@ -353,7 +354,7 @@ async function setVersionInChannel(
   permissions: OrganizationPerm,
 ) {
   const { data: versionId } = await supabase
-    .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })
+    .rpc('get_app_versions', { apikey, name_version: bundle, appid })
     .single()
 
   if (versionId && hasOrganizationPerm(permissions, OrganizationPerm.write)) {
@@ -375,7 +376,7 @@ async function setVersionInChannel(
     else if (data?.id)
       p.log.info(`Link device to this bundle to try it: ${bundleUrl}`)
 
-    if (options.bundleUrl) {
+    if (displayBundleUrl) {
       p.log.info(`Bundle url: ${bundleUrl}`)
     }
     else if (!versionId) {
@@ -436,7 +437,7 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
 
   // Now if it does exist we will fetch the org id
   const orgId = await getOrganizationId(supabase, appid)
-  await checkPlanValid(supabase, orgId, options.apikey, appid, true)
+  await checkPlanValid(supabase, orgId, apikey, appid, true)
   await checkTrial(supabase, orgId, localConfig)
   const { nativePackages, minUpdateVersion } = await verifyCompatibility(supabase, pm, options, channel, appid, bundle)
   await checkVersionExists(supabase, appid, bundle)
@@ -488,7 +489,7 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
     }
   }
 
-  await setVersionInChannel(supabase, options, bundle, channel, userId, orgId, appid, localConfig, permissions)
+  await setVersionInChannel(supabase, apikey, !!options.bundleUrl, bundle, channel, userId, orgId, appid, localConfig, permissions)
 
   await snag.track({
     channel: 'app',
@@ -507,9 +508,9 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
   return true
 }
 
-export async function uploadCommand(apikey: string, options: Options) {
+export async function uploadCommand(appid: string, options: Options) {
   try {
-    await uploadBundle(apikey, options, true)
+    await uploadBundle(appid, options, true)
   }
   catch (error) {
     p.log.error(formatError(error))
@@ -517,11 +518,11 @@ export async function uploadCommand(apikey: string, options: Options) {
   }
 }
 
-export async function uploadDeprecatedCommand(apikey: string, options: Options) {
+export async function uploadDeprecatedCommand(appid: string, options: Options) {
   const pm = getPMAndCommand()
   p.log.warn(`⚠️  This command is deprecated, use "${pm.runner} @capgo/cli bundle upload" instead ⚠️`)
   try {
-    await uploadBundle(apikey, options, true)
+    await uploadBundle(appid, options, true)
   }
   catch (error) {
     p.log.error(formatError(error))

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
+import { existsSync, readFileSync, readdir, readdirSync, statSync } from 'node:fs'
 import { homedir, platform as osPlatform } from 'node:os'
 import { join, resolve, sep } from 'node:path'
 import process from 'node:process'
@@ -11,7 +11,6 @@ import prettyjson from 'prettyjson'
 import { LogSnag } from 'logsnag'
 import * as p from '@clack/prompts'
 import ky from 'ky'
-import { promiseFiles } from 'node-dir'
 import { findRootSync } from '@manypkg/find-root'
 import type { InstallCommand, PackageManagerRunner, PackageManagerType } from '@capgo/find-package-manager'
 import { findInstallCommand, findPackageManagerRunner, findPackageManagerType } from '@capgo/find-package-manager'
@@ -840,16 +839,33 @@ export function getPMAndCommand() {
   return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner }
 }
 
+function readDirRecursively(dir: string): string[] {
+  const entries = readdirSync(dir, { withFileTypes: true })
+  const files = entries.flatMap((entry) => {
+    const fullPath = join(dir, entry.name)
+    if (entry.isDirectory()) {
+      return readDirRecursively(fullPath)
+    }
+    else {
+      // Use relative path to avoid issues with long paths on Windows
+      return fullPath.split(`node_modules${sep}`)[1] || fullPath
+    }
+  })
+  return files
+}
+
 export async function getLocalDepenencies() {
   const dir = findRootSync(process.cwd())
-  if (!existsSync('./package.json')) {
+  const packageJsonPath = join(process.cwd(), 'package.json')
+
+  if (!existsSync(packageJsonPath)) {
     p.log.error('Missing package.json, you need to be in a capacitor project')
     program.error('')
   }
 
   let packageJson
   try {
-    packageJson = JSON.parse(readFileSync('./package.json', 'utf8'))
+    packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
   }
   catch (err) {
     p.log.error('Invalid package.json, JSON parsing failed')
@@ -870,7 +886,8 @@ export async function getLocalDepenencies() {
     }
   }
 
-  if (!existsSync('./node_modules/')) {
+  const nodeModulesPath = join(process.cwd(), 'node_modules')
+  if (!existsSync(nodeModulesPath)) {
     const pm = findPackageManagerType(dir.rootDir, 'npm')
     const installCmd = findInstallCommand(pm)
     p.log.error(`Missing node_modules folder, please run ${pm} ${installCmd}`)
@@ -880,9 +897,9 @@ export async function getLocalDepenencies() {
   let anyInvalid = false
 
   const dependenciesObject = await Promise.all(Object.entries(dependencies as Record<string, string>)
-
     .map(async ([key, value]) => {
-      const dependencyFolderExists = existsSync(`./node_modules/${key}`)
+      const dependencyFolderPath = join(nodeModulesPath, key)
+      const dependencyFolderExists = existsSync(dependencyFolderPath)
 
       if (!dependencyFolderExists) {
         anyInvalid = true
@@ -893,16 +910,15 @@ export async function getLocalDepenencies() {
       }
 
       let hasNativeFiles = false
-      await promiseFiles(`./node_modules/${key}`)
-        .then((files) => {
-          if (files.find(fileName => nativeFileRegex.test(fileName)))
-            hasNativeFiles = true
-        })
-        .catch((error) => {
-          p.log.error(`Error reading node_modulses files for ${key} package`)
-          console.error(error)
-          program.error('')
-        })
+      try {
+        const files = readDirRecursively(dependencyFolderPath)
+        hasNativeFiles = files.some(fileName => nativeFileRegex.test(fileName))
+      }
+      catch (error) {
+        p.log.error(`Error reading node_modules files for ${key} package`)
+        console.error(error)
+        program.error('')
+      }
 
       return {
         name: key,