@capgo/cli 4.12.5 → 4.12.7

package/package.json

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

package/src/init.ts

@@ -1,4 +1,5 @@
-import { readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
+import path from 'node:path'
 import type { ExecSyncOptions } from 'node:child_process'
 import { execSync, spawnSync } from 'node:child_process'
 import process from 'node:process'
@@ -192,43 +193,96 @@ async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string
 async function step5(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const doAddCode = await p.confirm({ message: `Automatic Add "${codeInject}" code and import in ${appId}?` })
   await cancelCommand(doAddCode, orgId, snag)
+
   if (doAddCode) {
     const s = p.spinner()
     s.start(`Adding @capacitor-updater to your main file`)
-    const projectType = await findProjectType()
-    let mainFilePath
-    if (projectType === 'unknown')
-      mainFilePath = await findMainFile()
-    else
-      mainFilePath = await findMainFileForProjectType(projectType)
-
-    if (!mainFilePath) {
-      s.stop('Error')
-      p.log.warn('Cannot find main file, You need to add @capgo/capacitor-updater manually')
-      p.outro(`Bye 👋`)
-      process.exit()
-    }
-    // open main file and inject codeInject
-    const mainFile = readFileSync(mainFilePath)
-    // find the last import line in the file and inject codeInject after it
-    const mainFileContent = mainFile.toString()
-    const matches = mainFileContent.match(regexImport)
-    const last = matches?.pop()
-    if (!last) {
-      s.stop('Error')
-      p.log.warn(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`)
-      p.outro(`Bye 👋`)
-      process.exit()
-    }
 
-    if (mainFileContent.includes(codeInject)) {
-      s.stop(`Code already added to ${mainFilePath} ✅`)
+    const projectType = await findProjectType()
+    if (projectType === 'nuxtjs-js' || projectType === 'nuxtjs-ts') {
+      // Nuxt.js specific logic
+      const nuxtDir = path.join('plugins')
+      if (!existsSync(nuxtDir)) {
+        mkdirSync(nuxtDir, { recursive: true })
+      }
+      let nuxtFilePath
+      if (projectType === 'nuxtjs-ts') {
+        nuxtFilePath = path.join(nuxtDir, 'capacitorUpdater.client.ts')
+      }
+      else {
+        nuxtFilePath = path.join(nuxtDir, 'capacitorUpdater.client.js')
+      }
+      const nuxtFileContent = `
+        import { CapacitorUpdater } from '@capgo/capacitor-updater'
+
+        export default defineNuxtPlugin(() => {
+          CapacitorUpdater.notifyAppReady()
+        })
+      `
+      if (existsSync(nuxtFilePath)) {
+        const currentContent = readFileSync(nuxtFilePath, 'utf8')
+        if (currentContent.includes('CapacitorUpdater.notifyAppReady()')) {
+          s.stop('Code already added to capacitorUpdater.client.ts file inside plugins directory ✅')
+          p.log.info('Plugins directory and capacitorUpdater.client.ts file already exist with required code')
+        }
+        else {
+          writeFileSync(nuxtFilePath, nuxtFileContent, 'utf8')
+          s.stop('Code added to capacitorUpdater.client.ts file inside plugins directory ✅')
+          p.log.info('Updated capacitorUpdater.client.ts file with required code')
+        }
+      }
+      else {
+        writeFileSync(nuxtFilePath, nuxtFileContent, 'utf8')
+        s.stop('Code added to capacitorUpdater.client.ts file inside plugins directory ✅')
+        p.log.info('Created plugins directory and capacitorUpdater.client.ts file')
+      }
     }
     else {
-      const newMainFileContent = mainFileContent.replace(last, `${last}\n${importInject};\n\n${codeInject};\n`)
-      writeFileSync(mainFilePath, newMainFileContent)
-      s.stop(`Code added to ${mainFilePath} ✅`)
+      // Handle other project types
+      let mainFilePath
+      if (projectType === 'unknown') {
+        mainFilePath = await findMainFile()
+      }
+      else {
+        const isTypeScript = projectType.endsWith('-ts')
+        mainFilePath = await findMainFileForProjectType(projectType, isTypeScript)
+      }
+
+      if (!mainFilePath) {
+        s.stop('Error')
+        if (projectType === 'nextjs-js' || projectType === 'nextjs-ts') {
+          p.log.warn(`You might not be using app router configuration or the latest version of Next.js`)
+        }
+        else {
+          p.log.warn(`Cannot find the latest version of ${projectType}, you might need to upgrade to the latest version of ${projectType}`)
+        }
+        p.outro(`Bye 👋`)
+        process.exit()
+      }
+
+      // Open main file and inject codeInject
+      const mainFile = readFileSync(mainFilePath, 'utf8')
+      const mainFileContent = mainFile.toString()
+      const matches = mainFileContent.match(regexImport)
+      const last = matches?.pop()
+
+      if (!last) {
+        s.stop('Error')
+        p.log.warn(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`)
+        p.outro(`Bye 👋`)
+        process.exit()
+      }
+
+      if (mainFileContent.includes(codeInject)) {
+        s.stop(`Code already added to ${mainFilePath} ✅`)
+      }
+      else {
+        const newMainFileContent = mainFileContent.replace(last, `${last}\n${importInject};\n\n${codeInject};\n`)
+        writeFileSync(mainFilePath, newMainFileContent, 'utf8')
+        s.stop(`Code added to ${mainFilePath} ✅`)
+      }
     }
+
     await markStep(orgId, snag, 5)
   }
   else {

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { homedir, platform as osPlatform } from 'node:os'
-import { join, resolve, sep } from 'node:path'
+import path, { join, resolve, sep } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
 import { loadConfig } from '@capacitor/cli/dist/config'
@@ -317,13 +317,14 @@ async function* getFiles(dir: string): AsyncGenerator<string> {
   const dirents = await readdirSync(dir, { withFileTypes: true })
   for (const dirent of dirents) {
     const res = resolve(dir, dirent.name)
-    if (dirent.isDirectory()
+    if (
+      dirent.isDirectory()
       && !dirent.name.startsWith('.')
       && !dirent.name.startsWith('node_modules')
-      && !dirent.name.startsWith('dist')) {
+      && !dirent.name.startsWith('dist')
+    ) {
       yield * getFiles(res)
     }
-
     else {
       yield res
     }
@@ -334,46 +335,81 @@ export async function findProjectType() {
   // for nuxtjs check if nuxt.config.js exists
   // for nextjs check if next.config.js exists
   // for angular check if angular.json exists
-  // for sveltekit check if svelte.config.js exists
+  // for sveltekit check if svelte.config.js exists or svelte is in package.json dependancies
+  // for vue check if vue.config.js exists or vue is in package.json dependancies
+  // for react check if package.json exists and react is in dependencies
   const pwd = process.cwd()
+  let isTypeScript = false
+
+  // Check for TypeScript configuration file
+  const tsConfigPath = resolve(pwd, 'tsconfig.json')
+  if (existsSync(tsConfigPath)) {
+    isTypeScript = true
+  }
+
   for await (const f of getFiles(pwd)) {
     // find number of folder in path after pwd
     if (f.includes('angular.json')) {
       p.log.info('Found angular project')
-      return 'angular'
+      return isTypeScript ? 'angular-ts' : 'angular-js'
     }
-    if (f.includes('nuxt.config.js')) {
+    if (f.includes('nuxt.config.js' || f.includes('nuxt.config.ts'))) {
       p.log.info('Found nuxtjs project')
-      return 'nuxtjs'
+      return isTypeScript ? 'nuxtjs-ts' : 'nuxtjs-js'
     }
-    if (f.includes('next.config.js')) {
+    if (f.includes('next.config.js') || f.includes('next.config.mjs')) {
       p.log.info('Found nextjs project')
-      return 'nextjs'
+      return isTypeScript ? 'nextjs-ts' : 'nextjs-js'
     }
     if (f.includes('svelte.config.js')) {
       p.log.info('Found sveltekit project')
-      return 'sveltekit'
+      return isTypeScript ? 'sveltekit-ts' : 'sveltekit-js'
+    }
+    if (f.includes('rollup.config.js')) {
+      p.log.info('Found svelte project')
+      return isTypeScript ? 'svelte-ts' : 'svelte-js'
+    }
+    if (f.includes('vue.config.js')) {
+      p.log.info('Found vue project')
+      return isTypeScript ? 'vue-ts' : 'vue-js'
+    }
+    if (f.includes('package.json')) {
+      const packageJsonPath = path.resolve(f)
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+      if (packageJson.dependencies) {
+        if (packageJson.dependencies.react) {
+          p.log.info('Found react project test')
+          return isTypeScript ? 'react-ts' : 'react-js'
+        }
+        if (packageJson.dependencies.vue) {
+          p.log.info('Found vue project')
+          return isTypeScript ? 'vue-ts' : 'vue-js'
+        }
+      }
     }
   }
+
   return 'unknown'
 }
 
-export async function findMainFileForProjectType(projectType: string) {
-  if (projectType === 'angular')
-    return 'src/main.ts'
-
-  if (projectType === 'nuxtjs')
-    return 'src/main.ts'
-
-  if (projectType === 'nextjs')
-    return 'pages/_app.tsx'
-
-  if (projectType === 'sveltekit')
-    return 'src/main.ts'
-
+export function findMainFileForProjectType(projectType: string, isTypeScript: boolean): string | null {
+  if (projectType === 'angular') {
+    return isTypeScript ? 'src/main.ts' : 'src/main.js'
+  }
+  if (projectType === 'nextjs-js' || projectType === 'nextjs-ts') {
+    return isTypeScript ? 'src/app/layout.tsx' : 'src/app/layout.js'
+  }
+  if (projectType === 'svelte-js' || projectType === 'svelte-ts') {
+    return isTypeScript ? 'src/main.ts' : 'src/main.js'
+  }
+  if (projectType === 'vue-js' || projectType === 'vue-ts') {
+    return isTypeScript ? 'src/main.ts' : 'src/main.js'
+  }
+  if (projectType === 'react-js' || projectType === 'react-ts') {
+    return isTypeScript ? 'src/index.tsx' : 'src/index.js'
+  }
   return null
 }
-
 // create a function to find the right command to build the project in static mode depending on the project type
 
 export async function findBuildCommandForProjectType(projectType: string) {
@@ -948,10 +984,6 @@ export async function getRemoteChecksums(supabase: SupabaseClient<Database>, app
     || !data.version
     || !data.version.checksum
   ) {
-    p.log.error(`Cannot get remote checksum for channel ${channel}`)
-    p.log.error(`Error: ${error?.message}`)
-
-    program.error('')
     return null
   }
 
@@ -1018,7 +1050,7 @@ export async function checkChecksum(supabase: SupabaseClient<Database>, appId: s
   s.start(`Checking bundle checksum compatibility with channel ${channel}`)
   const remoteChecksum = await getRemoteChecksums(supabase, appId, channel)
 
-  if (remoteChecksum === currentChecksum) {
+  if (remoteChecksum && remoteChecksum === currentChecksum) {
     // cannot upload the same bundle
     p.log.error(`Cannot upload the same bundle content.\nCurrent bundle checksum matches remote bundle for channel ${channel}\nDid you builded your app before uploading ?`)
     program.error('')