@adobe/aio-cli-plugin-app 9.2.0 → 10.0.1

package/src/commands/app/delete/extension.js

@@ -14,7 +14,6 @@ const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-
 const { Flags } = require('@oclif/core')
 
 const { atLeastOne, deleteUserConfig } = require('../../../lib/app-helper')
-const { implPromptChoices } = require('../../../lib/defaults')
 const chalk = require('chalk')
 const fs = require('fs-extra')
 const { EOL } = require('os')
@@ -59,16 +58,15 @@ class DeleteExtensionCommand extends BaseCommand {
       throw new Error('There are no implementations left in the project')
     }
     if (!flags.extension) {
-      const alreadyImplementedChoices = implPromptChoices.filter(i => alreadyImplemented.includes(i.value.name))
       // prompt
       const answers = await this.prompt([{
         type: 'checkbox',
         name: 'res',
-        message: 'Which new implementation(s) do you wish to add to the project ?',
-        choices: alreadyImplementedChoices,
+        message: 'Which implementation(s) do you wish to delete from the project?',
+        choices: alreadyImplemented,
         validate: atLeastOne
       }])
-      flags.extension = answers.res.map(v => v.name)
+      flags.extension = answers.res
     }
     return this.getAppExtConfigs(flags)
   }
@@ -110,9 +108,10 @@ DeleteExtensionCommand.flags = {
     default: false,
     char: 'y'
   }),
-  'skip-install': Flags.boolean({
-    description: 'Skip npm installation after files are created',
-    default: false
+  install: Flags.boolean({
+    description: '[default: true] Run npm installation after files are created',
+    default: true,
+    allowNo: true
   }),
   extension: Flags.string({
     description: 'Specify extensions to delete, skips selection prompt',

package/src/commands/app/delete/service.js

@@ -34,7 +34,7 @@ class AddServiceCommand extends BaseCommand {
     // load console configuration from .aio and .env files
     const projectConfig = config.get('project')
     if (!projectConfig) {
-      this.error('Incomplete .aio configuration, please import a valid Adobe Developer Console configuration via `aio app use` first.')
+      this.error(`Incomplete .aio configuration, please import a valid Adobe Developer Console configuration via \`${this.config.bin} app use\` first.`)
     }
     const orgId = projectConfig.org.id
     const project = { name: projectConfig.name, id: projectConfig.id }

package/src/commands/app/deploy.js

@@ -27,17 +27,16 @@ class Deploy extends BuildCommand {
     const { flags } = await this.parse(Deploy)
 
     // flags
-    flags['web-assets'] = flags['web-assets'] && !flags['skip-web-assets'] && !flags['skip-static'] && !flags.action
-    flags.actions = flags.actions && !flags['skip-actions']
+    flags['web-assets'] = flags['web-assets'] && !flags.action
     flags.publish = flags.publish && !flags.action
-    flags.build = flags.build && !flags['skip-build']
 
     const deployConfigs = this.getAppExtConfigs(flags)
     const keys = Object.keys(deployConfigs)
     const values = Object.values(deployConfigs)
+    const isStandaloneApp = (keys.length === 1 && keys[0] === 'application')
 
     // if there are no extensions, then set publish to false
-    flags.publish = flags.publish && !(keys.length === 1 && keys[0] === 'application')
+    flags.publish = flags.publish && !isStandaloneApp
     let libConsoleCLI
     if (flags.publish) {
       // force login at beginning (if required)
@@ -45,9 +44,7 @@ class Deploy extends BuildCommand {
     }
 
     if (
-      (!flags.publish && !flags['web-assets'] && !flags.actions) ||
-      // NOTE skip deploy is deprecated
-      (!flags.publish && !flags.build && flags['skip-deploy'])
+      (!flags.publish && !flags['web-assets'] && !flags.actions)
     ) {
       this.error('Nothing to be done 🚫')
     }
@@ -86,7 +83,7 @@ class Deploy extends BuildCommand {
       }
 
       // 2. Bail if workspace is production and application status is PUBLISHED, honor force-deploy
-      if (aioConfig.project.workspace.name === 'Production' && !flags['force-deploy']) {
+      if (!isStandaloneApp && aioConfig?.project?.workspace?.name === 'Production' && !flags['force-deploy']) {
         const extension = await this.getApplicationExtension(libConsoleCLI, aioConfig)
         spinner.info(chalk.dim(JSON.stringify(extension)))
         if (extension && extension.status === 'PUBLISHED') {
@@ -144,103 +141,101 @@ class Deploy extends BuildCommand {
 
     const filterActions = flags.action
 
-    if (!flags['skip-deploy']) {
-      try {
-        await runScript(config.hooks['pre-app-deploy'])
-      } catch (err) {
-        this.log(err)
-      }
+    try {
+      await runScript(config.hooks['pre-app-deploy'])
+    } catch (err) {
+      this.log(err)
+    }
 
-      if (flags.actions) {
-        if (config.app.hasBackend) {
-          let filterEntities
-          if (filterActions) {
-            filterEntities = { actions: filterActions }
+    if (flags.actions) {
+      if (config.app.hasBackend) {
+        let filterEntities
+        if (filterActions) {
+          filterEntities = { actions: filterActions }
+        }
+        const message = `Deploying actions for '${name}'`
+        spinner.start(message)
+        try {
+          const script = await runScript(config.hooks['deploy-actions'])
+          if (!script) {
+            deployedRuntimeEntities = await rtLib.deployActions(config, { filterEntities }, onProgress)
           }
-          const message = `Deploying actions for '${name}'`
-          spinner.start(message)
-          try {
-            const script = await runScript(config.hooks['deploy-actions'])
-            if (!script) {
-              deployedRuntimeEntities = await rtLib.deployActions(config, { filterEntities }, onProgress)
-            }
 
-            if (deployedRuntimeEntities.actions && deployedRuntimeEntities.actions.length > 0) {
-              spinner.succeed(chalk.green(`Deployed ${deployedRuntimeEntities.actions.length} action(s) for '${name}'`))
+          if (deployedRuntimeEntities.actions && deployedRuntimeEntities.actions.length > 0) {
+            spinner.succeed(chalk.green(`Deployed ${deployedRuntimeEntities.actions.length} action(s) for '${name}'`))
+          } else {
+            if (script) {
+              spinner.fail(chalk.green(`deploy-actions skipped by hook '${name}'`))
             } else {
-              if (script) {
-                spinner.fail(chalk.green(`deploy-actions skipped by hook '${name}'`))
-              } else {
-                spinner.fail(chalk.green(`No actions deployed for '${name}'`))
-              }
+              spinner.fail(chalk.green(`No actions deployed for '${name}'`))
             }
-          } catch (err) {
-            spinner.fail(chalk.green(message))
-            throw err
           }
-        } else {
-          this.log(`no backend, skipping action deploy '${name}'`)
+        } catch (err) {
+          spinner.fail(chalk.green(message))
+          throw err
         }
+      } else {
+        this.log(`no backend, skipping action deploy '${name}'`)
       }
+    }
 
-      if (flags['web-assets']) {
-        if (config.app.hasFrontend) {
-          const message = `Deploying web assets for '${name}'`
-          spinner.start(message)
-          try {
-            const script = await runScript(config.hooks['deploy-static'])
-            if (script) {
-              spinner.fail(chalk.green(`deploy-static skipped by hook '${name}'`))
-            } else {
-              deployedFrontendUrl = await webLib.deployWeb(config, onProgress)
-              spinner.succeed(chalk.green(message))
-            }
-          } catch (err) {
-            spinner.fail(chalk.green(message))
-            throw err
+    if (flags['web-assets']) {
+      if (config.app.hasFrontend) {
+        const message = `Deploying web assets for '${name}'`
+        spinner.start(message)
+        try {
+          const script = await runScript(config.hooks['deploy-static'])
+          if (script) {
+            spinner.fail(chalk.green(`deploy-static skipped by hook '${name}'`))
+          } else {
+            deployedFrontendUrl = await webLib.deployWeb(config, onProgress)
+            spinner.succeed(chalk.green(message))
           }
-        } else {
-          this.log(`no frontend, skipping frontend deploy '${name}'`)
+        } catch (err) {
+          spinner.fail(chalk.green(message))
+          throw err
         }
+      } else {
+        this.log(`no frontend, skipping frontend deploy '${name}'`)
       }
+    }
 
-      // log deployed resources
-      if (deployedRuntimeEntities.actions && deployedRuntimeEntities.actions.length > 0) {
-        this.log(chalk.blue(chalk.bold('Your deployed actions:')))
-        const web = deployedRuntimeEntities.actions.filter(createWebExportFilter(true))
-        const nonWeb = deployedRuntimeEntities.actions.filter(createWebExportFilter(false))
-
-        if (web.length > 0) {
-          this.log('web actions:')
-          web.forEach(a => {
-            this.log(chalk.blue(chalk.bold(`  -> ${a.url || a.name} `)))
-          })
-        }
+    // log deployed resources
+    if (deployedRuntimeEntities.actions && deployedRuntimeEntities.actions.length > 0) {
+      this.log(chalk.blue(chalk.bold('Your deployed actions:')))
+      const web = deployedRuntimeEntities.actions.filter(createWebExportFilter(true))
+      const nonWeb = deployedRuntimeEntities.actions.filter(createWebExportFilter(false))
+
+      if (web.length > 0) {
+        this.log('web actions:')
+        web.forEach(a => {
+          this.log(chalk.blue(chalk.bold(`  -> ${a.url || a.name} `)))
+        })
+      }
 
-        if (nonWeb.length > 0) {
-          this.log('non-web actions:')
-          nonWeb.forEach(a => {
-            this.log(chalk.blue(chalk.bold(`  -> ${a.url || a.name} `)))
-          })
-        }
+      if (nonWeb.length > 0) {
+        this.log('non-web actions:')
+        nonWeb.forEach(a => {
+          this.log(chalk.blue(chalk.bold(`  -> ${a.url || a.name} `)))
+        })
       }
-      // TODO urls should depend on extension point, exc shell only for exc shell extension point - use a post-app-deploy hook ?
-      if (deployedFrontendUrl) {
-        this.log(chalk.blue(chalk.bold(`To view your deployed application:\n  -> ${deployedFrontendUrl}`)))
-        const launchUrl = this.getLaunchUrlPrefix() + deployedFrontendUrl
-        if (flags.open) {
-          this.log(chalk.blue(chalk.bold(`Opening your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
-          cli.open(launchUrl)
-        } else {
-          this.log(chalk.blue(chalk.bold(`To view your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
-        }
+    }
+    // TODO urls should depend on extension point, exc shell only for exc shell extension point - use a post-app-deploy hook ?
+    if (deployedFrontendUrl) {
+      this.log(chalk.blue(chalk.bold(`To view your deployed application:\n  -> ${deployedFrontendUrl}`)))
+      const launchUrl = this.getLaunchUrlPrefix() + deployedFrontendUrl
+      if (flags.open) {
+        this.log(chalk.blue(chalk.bold(`Opening your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
+        cli.open(launchUrl)
+      } else {
+        this.log(chalk.blue(chalk.bold(`To view your deployed application in the Experience Cloud shell:\n  -> ${launchUrl}`)))
       }
+    }
 
-      try {
-        await runScript(config.hooks['post-app-deploy'])
-      } catch (err) {
-        this.log(err)
-      }
+    try {
+      await runScript(config.hooks['post-app-deploy'])
+    } catch (err) {
+      this.log(err)
     }
   }
 
@@ -276,21 +271,6 @@ This will always force a rebuild unless --no-force-build is set.
 
 Deploy.flags = {
   ...BaseCommand.flags,
-  'skip-build': Flags.boolean({
-    description: '[deprecated] Please use --no-build'
-  }),
-  'skip-deploy': Flags.boolean({
-    description: '[deprecated] Please use \'aio app build\''
-  }),
-  'skip-static': Flags.boolean({
-    description: '[deprecated] Please use --no-web-assets'
-  }),
-  'skip-web-assets': Flags.boolean({
-    description: '[deprecated] Please use --no-web-assets'
-  }),
-  'skip-actions': Flags.boolean({
-    description: '[deprecated] Please use --no-actions'
-  }),
   actions: Flags.boolean({
     description: '[default: true] Deploy actions if any',
     default: true,