@adobe/aio-cli-plugin-app 8.5.0 → 8.6.1-pre.2022-06-25.2ab6c018

package/src/commands/app/add/web-assets.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const AddCommand = require('../../../AddCommand')
 const yeoman = require('yeoman-environment')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:web-assets', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const ora = require('ora')
 const generators = require('@adobe/generator-aio-app')
 const aioConfigLoader = require('@adobe/aio-lib-core-config')
@@ -20,7 +20,7 @@ const { servicesToGeneratorInput } = require('../../../lib/app-helper')
 
 class AddWebAssetsCommand extends AddCommand {
   async run () {
-    const { flags } = this.parse(AddWebAssetsCommand)
+    const { flags } = await this.parse(AddWebAssetsCommand)
     const spinner = ora()
     aioLogger.debug(`add web-assets with flags: ${JSON.stringify(flags)}`)
 
@@ -60,12 +60,12 @@ AddWebAssetsCommand.description = `Add web assets support
 `
 
 AddWebAssetsCommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Add web-assets to a specific extension',
     char: 'e',
     multiple: false,

package/src/commands/app/build.js

@@ -14,7 +14,7 @@ const ora = require('ora')
 const chalk = require('chalk')
 
 const BaseCommand = require('../../BaseCommand')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const { runScript, writeConfig } = require('../../lib/app-helper')
 const RuntimeLib = require('@adobe/aio-lib-runtime')
 const { bundle } = require('@adobe/aio-lib-web')
@@ -24,7 +24,7 @@ const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-
 class Build extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Build)
+    const { flags } = await this.parse(Build)
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags['skip-static'] && !flags['skip-web-assets'] && !flags.action
     flags.actions = flags.actions && !flags['skip-actions']
@@ -101,7 +101,7 @@ class Build extends BaseCommand {
     if (flags['web-assets']) {
       if (config.app.hasFrontend && (flags['force-build'] || !fs.existsSync(config.web.distProd))) {
         if (config.app.hasBackend) {
-          const urls = await RuntimeLib.utils.getActionUrls(config)
+          const urls = RuntimeLib.utils.getActionUrls(config, false, false, true)
           await writeConfig(config.web.injectedConfig, urls)
         }
         spinner.start('Building web assets')
@@ -144,47 +144,47 @@ This will always force a rebuild unless --no-force-build is set.
 
 Build.flags = {
   ...BaseCommand.flags,
-  'skip-static': flags.boolean({
+  'skip-static': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-web-assets': flags.boolean({
+  'skip-web-assets': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions'
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Build actions if any',
     default: true,
     allowNo: true,
     exclusive: ['action'] // should be action exclusive --no-action but see https://github.com/oclif/oclif/issues/600
   }),
-  action: flags.string({
+  action: Flags.string({
     description: 'Build only a specific action, the flags can be specified multiple times, this will set --no-publish',
     char: 'a',
     exclusive: ['extension'],
     multiple: true
   }),
-  'web-assets': flags.boolean({
+  'web-assets': Flags.boolean({
     description: '[default: true] Build web-assets if any',
     default: true,
     allowNo: true
   }),
-  'force-build': flags.boolean({
+  'force-build': Flags.boolean({
     description: '[default: true] Force a build even if one already exists',
     default: true,
     allowNo: true
   }),
-  'content-hash': flags.boolean({
+  'content-hash': Flags.boolean({
     description: '[default: true] Enable content hashing in browser code',
     default: true,
     allowNo: true
   }),
-  'web-optimize': flags.boolean({
+  'web-optimize': Flags.boolean({
     description: '[default: false] Enable optimization (minification) of js/css/html',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Build only a specific extension point, the flags can be specified multiple times',
     exclusive: ['action'],
     multiple: true,

package/src/commands/app/config/get/index.js

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../../BaseCommand')
 
 class IndexCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:config:get', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:config:get', '--help'])
   }
 }
 

package/src/commands/app/config/index.js

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../BaseCommand')
 
 class IndexCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:config', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:config', '--help'])
   }
 }
 

package/src/commands/app/config/set/index.js

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../../BaseCommand')
 
 class IndexCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:config:set', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:config:set', '--help'])
   }
 }
 

package/src/commands/app/create.js

@@ -11,11 +11,11 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../BaseCommand')
 const InitCommand = require('./init')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 class Create extends BaseCommand {
   async run () {
-    const { args, flags } = this.parse(Create)
+    const { args, flags } = await this.parse(Create)
 
     if (flags.import) {
       return InitCommand.run([args.path, '-y', '--import', flags.import])
@@ -29,7 +29,7 @@ Create.description = `Create a new Adobe I/O App with default parameters
 
 Create.flags = {
   ...BaseCommand.flags,
-  import: flags.string({
+  import: Flags.string({
     description: 'Import an Adobe I/O Developer Console configuration file',
     char: 'i'
   })

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

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 const inquirer = require('inquirer')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:delete:action', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const fs = require('fs-extra')
 const path = require('path')
 const chalk = require('chalk')
@@ -21,7 +21,7 @@ const { atLeastOne, deleteUserConfig } = require('../../../lib/app-helper')
 
 class DeleteActionCommand extends BaseCommand {
   async run () {
-    const { args, flags } = this.parse(DeleteActionCommand)
+    const { args, flags } = await this.parse(DeleteActionCommand)
 
     aioLogger.debug(`deleting actions from the project, with args ${JSON.stringify(args)}, and flags: ${JSON.stringify(flags)}`)
 
@@ -145,7 +145,7 @@ DeleteActionCommand.description = `Delete existing actions
 `
 
 DeleteActionCommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     char: 'y',
     default: false

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

@@ -12,12 +12,12 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 const yeoman = require('yeoman-environment')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:action', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const generators = require('@adobe/generator-aio-app')
 
 class DeleteCICommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(DeleteCICommand)
+    const { flags } = await this.parse(DeleteCICommand)
 
     aioLogger.debug(`deleting CI files from the project, using flags: ${JSON.stringify(flags)}`)
 
@@ -37,7 +37,7 @@ DeleteCICommand.description = `Delete existing CI files
 `
 
 DeleteCICommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'

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

@@ -11,13 +11,13 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../../BaseCommand')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:delete:event', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const DeleteActionCommand = require('./action')
 const chalk = require('chalk')
 
 class DeleteEventCommand extends BaseCommand {
   async run () {
-    const { args, flags } = this.parse(DeleteEventCommand)
+    const { args, flags } = await this.parse(DeleteEventCommand)
 
     aioLogger.debug(`deleting events from the project, with args ${JSON.stringify(args)}, and flags: ${JSON.stringify(flags)}`)
 
@@ -46,7 +46,7 @@ DeleteEventCommand.description = `Delete existing Adobe I/O Events actions
 `
 
 DeleteEventCommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     char: 'y',
     default: false

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

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../../BaseCommand')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:action', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const { atLeastOne, deleteUserConfig } = require('../../../lib/app-helper')
 const { implPromptChoices } = require('../../../lib/defaults')
@@ -21,7 +21,7 @@ const { EOL } = require('os')
 
 class DeleteExtensionCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(DeleteExtensionCommand)
+    const { flags } = await this.parse(DeleteExtensionCommand)
 
     aioLogger.debug(`delete extension with flags: ${JSON.stringify(flags)}`)
 
@@ -102,19 +102,19 @@ class DeleteExtensionCommand extends BaseCommand {
   }
 }
 
-DeleteExtensionCommand.description = `Add new extensions or a standalone application to the project
+DeleteExtensionCommand.description = `Delete existing extensions
 `
 DeleteExtensionCommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'
   }),
-  'skip-install': flags.boolean({
+  'skip-install': Flags.boolean({
     description: 'Skip npm installation after files are created',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Specify extensions to delete, skips selection prompt',
     char: 'e',
     multiple: true

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

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../BaseCommand')
 
 class DeleteCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:delete', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:delete', '--help'])
   }
 }
 

package/src/commands/app/delete/web-assets.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../../BaseCommand')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:action', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const fs = require('fs-extra')
 const inquirer = require('inquirer')
 const { atLeastOne } = require('../../../lib/app-helper')
@@ -21,7 +21,7 @@ const path = require('path')
 
 class DeleteWebAssetsCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(DeleteWebAssetsCommand)
+    const { flags } = await this.parse(DeleteWebAssetsCommand)
 
     aioLogger.debug(`deleting web assets from the project, using flags: ${JSON.stringify(flags)}`)
 
@@ -90,7 +90,7 @@ DeleteWebAssetsCommand.description = `Delete existing web assets
 `
 
 DeleteWebAssetsCommand.flags = {
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'

package/src/commands/app/deploy.js

@@ -12,13 +12,11 @@ governing permissions and limitations under the License.
 
 const ora = require('ora')
 const chalk = require('chalk')
-// const path = require('path')
-const { cli } = require('cli-ux')
 
 const BaseCommand = require('../../BaseCommand')
 const BuildCommand = require('./build')
 const webLib = require('@adobe/aio-lib-web')
-const { flags } = require('@oclif/command')
+const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
 const { createWebExportFilter, runScript, buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
@@ -26,7 +24,7 @@ const LogForwarding = require('../../lib/log-forwarding')
 class Deploy extends BuildCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Deploy)
+    const { flags } = await this.parse(Deploy)
 
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags['skip-web-assets'] && !flags['skip-static'] && !flags.action
@@ -260,80 +258,80 @@ This will always force a rebuild unless --no-force-build is set.
 
 Deploy.flags = {
   ...BaseCommand.flags,
-  'skip-build': flags.boolean({
+  'skip-build': Flags.boolean({
     description: '[deprecated] Please use --no-build'
   }),
-  'skip-deploy': flags.boolean({
+  'skip-deploy': Flags.boolean({
     description: '[deprecated] Please use \'aio app build\''
   }),
-  'skip-static': flags.boolean({
+  'skip-static': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-web-assets': flags.boolean({
+  'skip-web-assets': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions'
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Deploy actions if any',
     default: true,
     allowNo: true,
     exclusive: ['action'] // should be action exclusive --no-action but see https://github.com/oclif/oclif/issues/600
   }),
-  action: flags.string({
+  action: Flags.string({
     description: 'Deploy only a specific action, the flags can be specified multiple times, this will set --no-publish',
     char: 'a',
     exclusive: ['extension'],
     multiple: true
   }),
-  'web-assets': flags.boolean({
+  'web-assets': Flags.boolean({
     description: '[default: true] Deploy web-assets if any',
     default: true,
     allowNo: true
   }),
-  build: flags.boolean({
+  build: Flags.boolean({
     description: '[default: true] Run the build phase before deployment',
     default: true,
     allowNo: true
   }),
-  'force-build': flags.boolean({
+  'force-build': Flags.boolean({
     description: '[default: true] Force a build even if one already exists',
     exclusive: ['no-build'], // no-build
     default: true,
     allowNo: true
   }),
-  'content-hash': flags.boolean({
+  'content-hash': Flags.boolean({
     description: '[default: true] Enable content hashing in browser code',
     default: true,
     allowNo: true
   }),
-  open: flags.boolean({
+  open: Flags.boolean({
     description: 'Open the default web browser after a successful deploy, only valid if your app has a front-end',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Deploy only a specific extension, the flags can be specified multiple times',
     exclusive: ['action'],
     char: 'e',
     multiple: true
   }),
-  publish: flags.boolean({
+  publish: Flags.boolean({
     description: '[default: true] Publish extension(s) to Exchange',
     allowNo: true,
     default: true,
     exclusive: ['action']
   }),
-  'force-publish': flags.boolean({
+  'force-publish': Flags.boolean({
     description: 'Force publish extension(s) to Exchange, delete previously published extension points',
     default: false,
     exclusive: ['action', 'publish'] // no-publish is excluded
   }),
-  'web-optimize': flags.boolean({
+  'web-optimize': Flags.boolean({
     description: '[default: false] Enable optimization (minification) of web js/css/html',
     default: false
   }),
-  'log-forwarding-update': flags.boolean({
+  'log-forwarding-update': Flags.boolean({
     description: '[default: true] Update log forwarding configuration on server',
     default: true,
     allowNo: true

package/src/commands/app/get-url.js

@@ -12,17 +12,18 @@ governing permissions and limitations under the License.
 
 const chalk = require('chalk')
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const { wrapError } = require('../../lib/app-helper')
 const { getActionUrls } = require('@adobe/aio-lib-runtime').utils
 const yaml = require('js-yaml')
+const { loadLocalDevConfig } = require('../../lib/run-local-runtime')
 
 class GetUrlCommand extends BaseCommand {
   async run () {
     // cli input
-    const { args, flags } = this.parse(GetUrlCommand)
+    const { args, flags } = await this.parse(GetUrlCommand)
 
     try {
       const options = {}
@@ -45,9 +46,16 @@ class GetUrlCommand extends BaseCommand {
       }
 
       const actionUrls = {}
-      Object.values(fullConfig.all).forEach(config => {
-        Object.assign(actionUrls, getActionUrls(config, true))
-      })
+      if (flags.local) {
+        Object.values(fullConfig.all).forEach(config => {
+          const localDevConfig = loadLocalDevConfig(config)
+          Object.assign(actionUrls, getActionUrls(localDevConfig, false, true))
+        })
+      } else {
+        Object.values(fullConfig.all).forEach(config => {
+          Object.assign(actionUrls, getActionUrls(config, true))
+        })
+      }
       urls.runtime = actionUrls
       const cdnUrls = {}
       if (options.cdn) {
@@ -88,20 +96,23 @@ GetUrlCommand.description = 'Get action URLs'
 
 GetUrlCommand.flags = {
   ...BaseCommand.flags,
-  cdn: flags.boolean({
+  cdn: Flags.boolean({
     description: 'Display CDN based action URLs'
   }),
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  hson: flags.boolean({
+  hson: Flags.boolean({
     description: 'Output human readable json',
     char: 'h'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
+  }),
+  local: Flags.boolean({
+    description: 'Display locally based action URLs'
   })
 }
 

package/src/commands/app/index.js

@@ -10,13 +10,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 
 class IndexCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app', '--help'])
   }
 }
 

package/src/commands/app/info.js

@@ -11,14 +11,14 @@ governing permissions and limitations under the License.
 */
 
 const BaseCommand = require('../../BaseCommand')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const yaml = require('js-yaml')
 const deepCopy = require('lodash.clonedeep')
 
 class Info extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Info)
+    const { flags } = await this.parse(Info)
     const appConfig = deepCopy(this.getFullConfig({ allowNoImpl: true }))
 
     // includes .env secret delete all aio config for now
@@ -39,7 +39,7 @@ class Info extends BaseCommand {
       this.log(JSON.stringify(appConfig))
     } else if (flags.yml) {
       // remove undefined fields
-      this.log(yaml.safeDump(JSON.parse(JSON.stringify(appConfig))))
+      this.log(yaml.safeDump(JSON.parse(JSON.stringify(appConfig)), {}))
     } else { // flags.hson
       this.log(JSON.stringify(appConfig, null, 2))
     }
@@ -56,23 +56,23 @@ Info.description = `Display settings/configuration in use by an Adobe I/O App
 
 Info.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j',
     exclusive: ['hson', 'yml']
   }),
-  hson: flags.boolean({
+  hson: Flags.boolean({
     default: true,
     description: 'Output human readable json',
     char: 'h',
     exclusive: ['json', 'yml']
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y',
     exclusive: ['hson', 'json']
   }),
-  mask: flags.boolean({
+  mask: Flags.boolean({
     description: 'Hide known private info',
     default: true,
     allowNo: true