@capgo/cli 4.12.1 → 4.12.3

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.12.3](https://github.com/Cap-go/CLI/compare/v4.12.2...v4.12.3) (2024-07-08)
+
+
+### Bug Fixes
+
+* getLocalDepenencies for windows ([ca7bf4e](https://github.com/Cap-go/CLI/commit/ca7bf4e97c6a2ff766978ed61089fd805126dde1))
+
+### [4.12.2](https://github.com/Cap-go/CLI/compare/v4.12.1...v4.12.2) (2024-07-08)
+
+
+### Bug Fixes
+
+* issue with upload ([ca08aec](https://github.com/Cap-go/CLI/commit/ca08aec7f38e1ae9c431ba35764f8659b23692e1))
+
 ### [4.12.1](https://github.com/Cap-go/CLI/compare/v4.12.0...v4.12.1) (2024-07-08)
 
 

package/dist/index.js

@@ -87381,7 +87381,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.12.1",
+  version: "4.12.3",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -89129,13 +89129,14 @@ function getPMAndCommand() {
 }
 async function getLocalDepenencies() {
   const dir = (0, import_find_root.findRootSync)(import_node_process8.default.cwd());
-  if (!(0, import_node_fs4.existsSync)("./package.json")) {
+  const packageJsonPath = (0, import_node_path2.join)(import_node_process8.default.cwd(), "package.json");
+  if (!(0, import_node_fs4.existsSync)(packageJsonPath)) {
     f2.error("Missing package.json, you need to be in a capacitor project");
     program.error("");
   }
   let packageJson;
   try {
-    packageJson = JSON.parse((0, import_node_fs4.readFileSync)("./package.json", "utf8"));
+    packageJson = JSON.parse((0, import_node_fs4.readFileSync)(packageJsonPath, "utf8"));
   } catch (err) {
     f2.error("Invalid package.json, JSON parsing failed");
     console.error("json parse error: ", err);
@@ -89152,7 +89153,8 @@ async function getLocalDepenencies() {
       program.error("");
     }
   }
-  if (!(0, import_node_fs4.existsSync)("./node_modules/")) {
+  const nodeModulesPath = (0, import_node_path2.join)(import_node_process8.default.cwd(), "node_modules");
+  if (!(0, import_node_fs4.existsSync)(nodeModulesPath)) {
     const pm2 = findPackageManagerType(dir.rootDir, "npm");
     const installCmd = findInstallCommand(pm2);
     f2.error(`Missing node_modules folder, please run ${pm2} ${installCmd}`);
@@ -89160,7 +89162,8 @@ async function getLocalDepenencies() {
   }
   let anyInvalid = false;
   const dependenciesObject = await Promise.all(Object.entries(dependencies).map(async ([key2, value]) => {
-    const dependencyFolderExists = (0, import_node_fs4.existsSync)(`./node_modules/${key2}`);
+    const dependencyFolderPath = (0, import_node_path2.join)(nodeModulesPath, key2);
+    const dependencyFolderExists = (0, import_node_fs4.existsSync)(dependencyFolderPath);
     if (!dependencyFolderExists) {
       anyInvalid = true;
       const pm2 = findPackageManagerType(dir.rootDir, "npm");
@@ -89169,14 +89172,14 @@ async function getLocalDepenencies() {
       return { name: key2, version: value };
     }
     let hasNativeFiles = false;
-    await (0, import_node_dir.promiseFiles)(`./node_modules/${key2}`).then((files) => {
-      if (files.find((fileName) => nativeFileRegex.test(fileName)))
-        hasNativeFiles = true;
-    }).catch((error) => {
-      f2.error(`Error reading node_modulses files for ${key2} package`);
+    try {
+      const files = await (0, import_node_dir.promiseFiles)(dependencyFolderPath);
+      hasNativeFiles = files.some((fileName) => nativeFileRegex.test(fileName));
+    } catch (error) {
+      f2.error(`Error reading node_modules files for ${key2} package`);
       console.error(error);
       program.error("");
-    });
+    }
     return {
       name: key2,
       version: value,
@@ -90225,8 +90228,8 @@ async function uploadBundleToCapgoCloud(supabase, appid, bundle2, orgId, zipped,
   const uploadTime = ((endTime - startTime) / 1e3).toFixed(2);
   spinner.stop(`Bundle Uploaded \u{1F4AA} (${uploadTime} seconds)`);
 }
-async function setVersionInChannel(supabase, options, bundle2, channel2, userId, orgId, appid, localConfig, permissions) {
-  const { data: versionId } = await supabase.rpc("get_app_versions", { apikey: options.apikey, name_version: bundle2, appid }).single();
+async function setVersionInChannel(supabase, apikey, displayBundleUrl, bundle2, channel2, userId, orgId, appid, localConfig, permissions) {
+  const { data: versionId } = await supabase.rpc("get_app_versions", { apikey, name_version: bundle2, appid }).single();
   if (versionId && hasOrganizationPerm(permissions, 3 /* write */)) {
     const { error: dbError3, data } = await updateOrCreateChannel(supabase, {
       name: channel2,
@@ -90245,7 +90248,7 @@ async function setVersionInChannel(supabase, options, bundle2, channel2, userId,
       f2.info("Your update is now available in your public channel \u{1F389}");
     else if (data?.id)
       f2.info(`Link device to this bundle to try it: ${bundleUrl}`);
-    if (options.bundleUrl) {
+    if (displayBundleUrl) {
       f2.info(`Bundle url: ${bundleUrl}`);
     } else if (!versionId) {
       f2.warn("Cannot set bundle with upload key, use key with more rights for that");
@@ -90285,7 +90288,7 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
   const userId = await verifyUser(supabase, apikey, ["write", "all", "upload"]);
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, apikey, appid, 2 /* upload */);
   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, pm2, options, channel2, appid, bundle2);
   await checkVersionExists(supabase, appid, bundle2);
@@ -90330,7 +90333,7 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
       program.error("");
     }
   }
-  await setVersionInChannel(supabase, options, bundle2, channel2, userId, orgId, appid, localConfig, permissions);
+  await setVersionInChannel(supabase, apikey, !!options.bundleUrl, bundle2, channel2, userId, orgId, appid, localConfig, permissions);
   await snag.track({
     channel: "app",
     event: "App Uploaded",
@@ -90347,19 +90350,19 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
   }
   return true;
 }
-async function uploadCommand(apikey, options) {
+async function uploadCommand(appid, options) {
   try {
-    await uploadBundle(apikey, options, true);
+    await uploadBundle(appid, options, true);
   } catch (error) {
     f2.error(formatError(error));
     program.error("");
   }
 }
-async function uploadDeprecatedCommand(apikey, options) {
+async function uploadDeprecatedCommand(appid, options) {
   const pm2 = getPMAndCommand();
   f2.warn(`\u26A0\uFE0F  This command is deprecated, use "${pm2.runner} @capgo/cli bundle upload" instead \u26A0\uFE0F`);
   try {
-    await uploadBundle(apikey, options, true);
+    await uploadBundle(appid, options, true);
   } catch (error) {
     f2.error(formatError(error));
     program.error("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.12.1",
+  "version": "4.12.3",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

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

@@ -842,14 +842,16 @@ export function getPMAndCommand() {
 
 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 +872,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 +883,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 +896,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 = await promiseFiles(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,