@capgo/cli 4.4.5 → 4.6.0

package/eslint.config.js

@@ -1,3 +1,10 @@
 const antfu = require('@antfu/eslint-config').default
 
-module.exports = antfu()
+module.exports = antfu({
+  ignores: [
+    'dist',
+    'test',
+    'webpack.config.js',
+    'src/types/types_supabase.ts',
+  ],
+})

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@capgo/cli",
-  "version": "4.4.5",
+  "version": "4.6.0",
   "description": "A CLI to upload to capgo servers",
-  "main": "dist/index.js",
-  "bin": {
-    "capgo": "dist/index.js"
-  },
+  "author": "github.com/riderx",
+  "license": "Apache 2.0",
+  "homepage": "https://github.com/Cap-go/CLIl#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Cap-go/CLI.git"
@@ -13,11 +12,6 @@
   "bugs": {
     "url": "https://github.com/Cap-go/CLI/issues"
   },
-  "homepage": "https://github.com/Cap-go/CLIl#readme",
-  "engines": {
-    "npm": ">=8.0.0",
-    "node": ">=18.0.0"
-  },
   "keywords": [
     "appflow alternative",
     "ionic",
@@ -29,6 +23,14 @@
     "upload",
     "capgo-cli"
   ],
+  "main": "dist/index.js",
+  "bin": {
+    "capgo": "dist/index.js"
+  },
+  "engines": {
+    "npm": ">=8.0.0",
+    "node": ">=18.0.0"
+  },
   "scripts": {
     "build": "node build.mjs",
     "dev": "NODE_ENV=development node build.mjs",
@@ -40,58 +42,48 @@
     "test_rls": "ts-node ./test/test_headers_rls.ts",
     "lint": "eslint \"src/**/*.ts\" --fix"
   },
-  "author": "github.com/riderx",
-  "license": "Apache 2.0",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.540.0",
-    "@capacitor/cli": "5.7.0",
+    "@aws-sdk/client-s3": "^3.563.0",
+    "@capacitor/cli": "6.0.0",
     "@capgo/find-package-manager": "0.0.11",
     "@clack/prompts": "^0.7.0",
-    "@supabase/supabase-js": "^2.39.3",
+    "@supabase/supabase-js": "^2.42.7",
     "@tomasklaen/checksum": "^1.1.0",
     "@trufflesuite/spinnies": "^0.1.1",
-    "adm-zip": "^0.5.10",
+    "adm-zip": "^0.5.12",
     "ci-info": "^4.0.0",
     "commander": "12.0.0",
     "console-table-printer": "^2.12.0",
     "get-latest-version": "^5.1.0",
-    "ky": "^1.2.0",
+    "ky": "^1.2.4",
     "logsnag": "1.0.0",
-    "mime": "^4.0.1",
+    "mime": "^4.0.3",
     "node-dir": "^0.1.17",
-    "open": "^10.0.3",
+    "open": "^10.1.0",
     "prettyjson": "^1.2.5",
     "prompt-sync": "^4.2.0",
-    "qrcode": "^1.5.3",
     "semver": "^7.6.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.6.4",
+    "@antfu/eslint-config": "^2.16.1",
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^3.0.4",
-    "@types/node": "^20.11.17",
+    "@types/node": "^20.12.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",
-    "@types/qrcode": "^1.5.5",
-    "@types/semver": "^7.5.6",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
-    "esbuild": "^0.20.0",
-    "eslint": "8.56.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "3.6.1",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "git-format-staged": "3.0.0",
-    "husky": "^9.0.10",
+    "@types/semver": "^7.5.8",
+    "@typescript-eslint/eslint-plugin": "7.7.1",
+    "@typescript-eslint/parser": "7.7.1",
+    "esbuild": "^0.20.2",
+    "eslint": "9.1.1",
+    "git-format-staged": "3.1.1",
+    "husky": "^9.0.11",
     "pkg": "5.8.1",
-    "prettier": "3.2.5",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.3.3"
+    "typescript": "5.4.5"
   }
 }

package/src/api/update.ts

@@ -4,7 +4,7 @@ import pack from '../../package.json'
 
 export async function checkLatest() {
   const latest = await getLatest('@capgo/cli')
-  const major = latest.split('.')[0]
+  const major = latest?.split('.')[0]
   if (latest !== pack.version) {
     p.log.warning(`🚨 You are using @capgo/cli@${pack.version} it's not the latest version.
 Please use @capgo/cli@${latest}" or @capgo/cli@${major} to keep up to date with the latest features and bug fixes.`,

package/src/bundle/upload.ts

@@ -19,7 +19,6 @@ import type {
   OptionsBase,
 } from '../utils'
 import {
-  EMPTY_UUID,
   OrganizationPerm,
   baseKeyPub,
   checkCompatibility,
@@ -29,7 +28,6 @@ import {
   deletedFailedVersion,
   findSavedKey,
   formatError,
-  getAppOwner,
   getConfig,
   getLocalConfig,
   getLocalDepenencies,
@@ -358,8 +356,6 @@ It will be also visible in your dashboard\n`)
 
   const nativePackages = (hashedLocalDependencies.size > 0 || !options.ignoreMetadataCheck) ? Array.from(hashedLocalDependencies, ([name, value]) => ({ name, version: value.version })) : undefined
 
-  const appOwner = await getAppOwner(supabase, appid)
-
   const versionData = {
     // bucket_id: external ? undefined : fileName,
     name: bundle,
@@ -369,7 +365,7 @@ It will be also visible in your dashboard\n`)
     storage_provider: external ? 'external' : 'r2-direct',
     minUpdateVersion,
     native_packages: nativePackages,
-    owner_org: EMPTY_UUID,
+    owner_org: orgId,
     user_id: userId,
     checksum,
   }
@@ -415,7 +411,7 @@ It will be also visible in your dashboard\n`)
     }
     spinner.stop('Bundle Uploaded 💪')
   }
-  else if (useS3 && zipped) {
+  else if (useS3 && zipped && s3Client) {
     const spinner = p.spinner()
     spinner.start(`Uploading Bundle`)
 
@@ -450,9 +446,9 @@ It will be also visible in your dashboard\n`)
     const { error: dbError3, data } = await updateOrCreateChannel(supabase, {
       name: channel,
       app_id: appid,
-      created_by: appOwner,
+      created_by: userId,
       version: versionId,
-      owner_org: EMPTY_UUID,
+      owner_org: orgId,
     })
     if (dbError3) {
       p.log.error(`Cannot set channel, the upload key is not allowed to do that, use the "all" for this. ${formatError(dbError3)}`)

package/src/channel/add.ts

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { createChannel, findUnknownVersion } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { EMPTY_UUID, OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 interface Options extends OptionsBase {
   default?: boolean
@@ -34,6 +34,7 @@ export async function addChannel(channelId: string, appId: string, options: Opti
   p.log.info(`Creating channel ${appId}#${channelId} to Capgo`)
   try {
     const data = await findUnknownVersion(supabase, appId)
+    const orgId = await getOrganizationId(supabase, appId)
     if (!data) {
       p.log.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`)
       program.error('')
@@ -42,7 +43,7 @@ export async function addChannel(channelId: string, appId: string, options: Opti
       name: channelId,
       app_id: appId,
       version: data.id,
-      owner_org: EMPTY_UUID,
+      owner_org: orgId,
     })
     p.log.success(`Channel created ✅`)
     await snag.track({

package/src/channel/set.ts

@@ -29,7 +29,8 @@ interface Options extends OptionsBase {
   android?: boolean
   selfAssign?: boolean
   disableAutoUpdate: string
-  channel?: string
+  dev?: boolean
+  emulator?: boolean
 }
 
 const disableAutoUpdatesPossibleOptions = ['major', 'minor', 'metadata', 'patch', 'none']
@@ -56,7 +57,7 @@ export async function setChannel(channel: string, appId: string, options: Option
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
   const orgId = await getOrganizationId(supabase, appId)
 
-  const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, state, disableAutoUpdate } = options
+  const { bundle, state, downgrade, latest, upgrade, ios, android, selfAssign, disableAutoUpdate, dev, emulator } = options
   if (!channel) {
     p.log.error('Missing argument, you need to provide a channel')
     program.error('')
@@ -73,6 +74,8 @@ export async function setChannel(channel: string, appId: string, options: Option
     && ios == null
     && android == null
     && selfAssign == null
+    && dev == null
+    && emulator == null
     && disableAutoUpdate == null) {
     p.log.error('Missing argument, you need to provide a option to set')
     program.error('')
@@ -83,6 +86,7 @@ export async function setChannel(channel: string, appId: string, options: Option
       created_by: userId,
       app_id: appId,
       name: channel,
+      owner_org: orgId,
       version: undefined as any,
     }
     const bundleVersion = latest ? config?.app?.package?.version : bundle

package/src/index.ts

@@ -248,6 +248,10 @@ channel
   .option('--self-assign', 'Allow to device to self assign to this channel')
   .option('--no-self-assign', 'Disable devices to self assign to this channel')
   .option('--disable-auto-update <disableAutoUpdate>', 'Disable auto update strategy for this channel.The possible options are: major, minor, metadata, patch, none')
+  .option('--dev', 'Allow sending update to development devices')
+  .option('--no-dev', 'Disable sending update to development devices')
+  .option('--emulator', 'Allow sending update to emulator devices')
+  .option('--no-emulator', 'Disable sending update to emulator devices')
 
 const key = program
   .command('key')

package/src/init.ts

@@ -79,6 +79,7 @@ async function step3(userId: string, snag: LogSnag, apikey: string, appId: strin
   await markStep(userId, snag, 3)
 }
 
+const urlMigrateV6 = 'https://capacitorjs.com/docs/updating/6-0'
 const urlMigrateV5 = 'https://capacitorjs.com/docs/updating/5-0'
 async function step4(userId: string, snag: LogSnag, apikey: string, appId: string) {
   const doInstall = await p.confirm({ message: `Automatic Install "@capgo/capacitor-updater" dependency in ${appId}?` })
@@ -86,6 +87,7 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
   if (doInstall) {
     const s = p.spinner()
     s.start(`Checking if @capgo/capacitor-updater is installed`)
+    let versionToInstall = 'latest'
     const pack = JSON.parse(readFileSync('package.json').toString())
     let coreVersion = pack.dependencies['@capacitor/core'] || pack.devDependencies['@capacitor/core']
     coreVersion = coreVersion?.replace('^', '').replace('~', '')
@@ -97,6 +99,10 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
       s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`)
       process.exit()
     }
+    else if (semver.lt(coreVersion, '6.0.0')) {
+      s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v6: ${urlMigrateV6} to access the best features of Capgo`)
+      versionToInstall = '^5.0.0'
+    }
     const pm = findPackageManagerType()
     if (pm === 'unknown') {
       s.stop(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`)
@@ -110,7 +116,7 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
       s.stop(`Capgo already installed ✅`)
     }
     else {
-      await execSync(`${pm} ${installCmd} @capgo/capacitor-updater@latest`, execOption as ExecSyncOptions)
+      await execSync(`${pm} ${installCmd} @capgo/capacitor-updater@${versionToInstall}`, execOption as ExecSyncOptions)
       s.stop(`Install Done ✅`)
     }
   }