@adobe/aio-cli-plugin-app 10.3.1 → 10.4.0-pre.2023-07-10.283ea03c

package/README.md

@@ -71,7 +71,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/10.3.1/src/commands/app/index.js)_
+_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/10.4.0-pre.2023-07-10.283ea03c/src/commands/app/index.js)_
 
 ## `aio app add`
 
@@ -415,7 +415,7 @@ Build and deploy an Adobe I/O App
 USAGE
   $ aio app deploy [-v] [--version] [--actions | -a <value>] [--web-assets] [--force-build | ] [--content-hash]
     [--web-optimize] [-e <value> | ] [--build] [--open] [--force-deploy] [--force-publish |  | --publish]
-    [--log-forwarding-update]
+    [--force-events ] [--log-forwarding-update]
 
 FLAGS
   -a, --action=<value>...       Deploy only a specific action, the flags can be specified multiple times, this will set
@@ -428,6 +428,7 @@ FLAGS
   --[no-]force-build            [default: true] Force a build even if one already exists
   --force-deploy                [default: false] Force deploy changes, regardless of production Workspace being
                                 published in Exchange.
+  --[no-]force-events           [default: false] Force event registrations and overwrite any previous registrations
   --force-publish               [default: false] Force publish extension(s) to Exchange, delete previously published
                                 extension points
   --[no-]log-forwarding-update  [default: true] Update log forwarding configuration on server

package/bin/openwhisk-standalone-config/get-runtimes.js

@@ -17,9 +17,10 @@ const DOCKER_REPOS = { // repo-name:kind
   'adobe-action-nodejs-v12': 'nodejs:12',
   'adobe-action-nodejs-v14': 'nodejs:14',
   'adobe-action-nodejs-v16': 'nodejs:16',
+  'adobe-action-nodejs-v18': 'nodejs:18'
 }
 
-const DEFAULT_KIND = 'nodejs:16'
+const DEFAULT_KIND = 'nodejs:18'
 
 async function main() {
     const nodejs = []

package/bin/openwhisk-standalone-config/runtimes.json

@@ -6,7 +6,7 @@
         "image": {
           "prefix": "adobeapiplatform",
           "name": "adobe-action-nodejs-v10",
-          "tag": "3.0.32"
+          "tag": "3.0.37"
         }
       },
       {
@@ -14,7 +14,7 @@
         "image": {
           "prefix": "adobeapiplatform",
           "name": "adobe-action-nodejs-v12",
-          "tag": "3.0.32"
+          "tag": "3.0.37"
         }
       },
       {
@@ -22,16 +22,24 @@
         "image": {
           "prefix": "adobeapiplatform",
           "name": "adobe-action-nodejs-v14",
-          "tag": "3.0.32"
+          "tag": "3.0.37"
         }
       },
       {
         "kind": "nodejs:16",
-        "default": true,
         "image": {
           "prefix": "adobeapiplatform",
           "name": "adobe-action-nodejs-v16",
-          "tag": "3.0.32"
+          "tag": "3.0.37"
+        }
+      },
+      {
+        "kind": "nodejs:18",
+        "default": true,
+        "image": {
+          "prefix": "adobeapiplatform",
+          "name": "adobe-action-nodejs-v18",
+          "tag": "3.0.37"
         }
       }
     ]

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "10.3.1",
+  "version": "10.4.0-pre.2023-07-10.283ea03c",
   "commands": {
     "app:build": {
       "id": "app:build",
@@ -232,6 +232,19 @@
             "publish"
           ]
         },
+        "force-events": {
+          "name": "force-events",
+          "type": "boolean",
+          "description": "[default: false] Force event registrations and overwrite any previous registrations",
+          "allowNo": true,
+          "dependsOn": [
+            "feature-event-hooks"
+          ],
+          "exclusive": [
+            "action",
+            "publish"
+          ]
+        },
         "log-forwarding-update": {
           "name": "log-forwarding-update",
           "type": "boolean",

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.3.1",
+  "version": "10.4.0-pre.2023-07-10.283ea03c",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
-    "@adobe/aio-cli-lib-app-config": "^1.0.1",
+    "@adobe/aio-cli-lib-app-config": "next",
     "@adobe/aio-cli-lib-console": "^4.1.0",
     "@adobe/aio-lib-core-config": "^3.0.0",
     "@adobe/aio-lib-core-logging": "^2.0.0",
@@ -102,5 +102,6 @@
   },
   "bin": {
     "aio-next": "./bin/run"
-  }
-}
+  },
+  "prereleaseSha": "283ea03ce635f35a5ed9c2d75e3ae837246970c0"
+}

package/schema/index.js

@@ -10,10 +10,9 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE, IMPORT_CONFIG_FILE } = require('../src/lib/defaults')
+const { DEPLOY_CONFIG_FILE, IMPORT_CONFIG_FILE } = require('../src/lib/defaults')
 
 module.exports = {
   [IMPORT_CONFIG_FILE]: require('./config.schema.json'),
-  [USER_CONFIG_FILE]: require('./app.config.yaml.schema.json'),
   [DEPLOY_CONFIG_FILE]: require('./deploy.yaml.schema.json')
 }

package/src/BaseCommand.js

@@ -14,7 +14,7 @@ const chalk = require('chalk')
 const coreConfig = require('@adobe/aio-lib-core-config')
 const DEFAULT_LAUNCH_PREFIX = 'https://experience.adobe.com/?devMode=true#/custom-apps/?localDevUrl='
 const STAGE_LAUNCH_PREFIX = 'https://experience-stage.adobe.com/?devMode=true#/custom-apps/?localDevUrl='
-const loadConfig = require('@adobe/aio-cli-lib-app-config')
+const libAppConfig = require('@adobe/aio-cli-lib-app-config')
 const inquirer = require('inquirer')
 const { CONSOLE_API_KEYS, APPLICATION_CONFIG_KEY, EXTENSIONS_CONFIG_KEY } = require('./lib/defaults')
 const { getCliInfo } = require('./lib/app-helper')
@@ -67,8 +67,8 @@ class BaseCommand extends Command {
     LibConsoleCLI.cleanStdOut()
   }
 
-  getAppExtConfigs (flags, options = {}) {
-    const all = this.getFullConfig(options).all
+  async getAppExtConfigs (flags, options = {}) {
+    const all = (await this.getFullConfig(options)).all
 
     // default case: no flags, return all
     let ret = all
@@ -98,25 +98,25 @@ class BaseCommand extends Command {
     return ret
   }
 
-  getRuntimeManifestConfigFile (implName) {
+  async getRuntimeManifestConfigFile (implName) {
     let configKey
     if (implName === APPLICATION_CONFIG_KEY) {
       configKey = APPLICATION_CONFIG_KEY
     } else {
       configKey = `${EXTENSIONS_CONFIG_KEY}.${implName}`
     }
-    let configData = this.getConfigFileForKey(`${configKey}.runtimeManifest`)
+    let configData = await this.getConfigFileForKey(`${configKey}.runtimeManifest`)
     if (!configData.file) {
       // first action manifest is not defined
-      configData = this.getConfigFileForKey(`${configKey}`)
+      configData = await this.getConfigFileForKey(`${configKey}`)
       configData.key = configData.key + '.runtimeManifest'
     }
     return configData
   }
 
-  getConfigFileForKey (fullKey) {
+  async getConfigFileForKey (fullKey) {
     // NOTE: the index returns undefined if the key is loaded from a legacy configuration file
-    const fullConfig = this.getFullConfig()
+    const fullConfig = await this.getFullConfig()
     // full key like 'extensions.dx/excshell/1.runtimeManifest'
     // returns { key: relKey, file: configFile}
     const configData = fullConfig.includeIndex[fullKey]
@@ -128,9 +128,9 @@ class BaseCommand extends Command {
     return configData || {}
   }
 
-  getFullConfig (options = {}) {
+  async getFullConfig (options = {}) {
     if (!this.appConfig) {
-      this.appConfig = loadConfig(options)
+      this.appConfig = await libAppConfig.load(options)
     }
     return this.appConfig
   }

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

@@ -24,7 +24,7 @@ class AddActionCommand extends TemplatesCommand {
     aioLogger.debug(`add actions with flags: ${JSON.stringify(flags)}`)
 
     // guaranteed to have at least one, otherwise would throw in config load or in matching the ext name
-    const entries = Object.entries(this.getAppExtConfigs(flags))
+    const entries = Object.entries(await this.getAppExtConfigs(flags))
     if (entries.length > 1) {
       this.error('Please use the \'-e\' flag to specify to which implementation you want to add actions to.')
     }
@@ -32,7 +32,7 @@ class AddActionCommand extends TemplatesCommand {
     const config = entries[0][1]
 
     const actionFolder = path.relative(config.root, config.actions.src)
-    const configData = this.getRuntimeManifestConfigFile(configName)
+    const configData = await this.getRuntimeManifestConfigFile(configName)
 
     const projectOrgId = aioConfigLoader.get('project.org.id')
     if (!projectOrgId) {

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

@@ -25,14 +25,14 @@ class AddEventCommand extends AddCommand {
     const spinner = ora()
 
     // guaranteed to have at least one, otherwise would throw in config load or in matching the ext name
-    const entries = Object.entries(this.getAppExtConfigs(flags))
+    const entries = Object.entries(await this.getAppExtConfigs(flags))
     if (entries.length > 1) {
       this.error('Please use the \'-e\' flag to specify to which implementation you want to add events to.')
     }
     const configName = entries[0][0]
     const config = entries[0][1]
     const actionFolder = path.relative(config.root, config.actions.src)
-    const configData = this.getRuntimeManifestConfigFile(configName)
+    const configData = await this.getRuntimeManifestConfigFile(configName)
 
     const env = yeoman.createEnv()
     // by default yeoman runs the install, we control installation from the app plugin

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

@@ -24,7 +24,7 @@ class AddExtensionCommand extends TemplatesCommand {
       this.error('--extension= must also be provided when using --yes')
     }
 
-    const fullConfig = this.getFullConfig({ allowNoImpl: true })
+    const fullConfig = await this.getFullConfig({ allowNoImpl: true })
     const alreadyImplemented = fullConfig.implements
 
     if (flags.extension) {

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

@@ -19,9 +19,9 @@ class AddWebAssetsCommand extends TemplatesCommand {
     const { flags } = await this.parse(AddWebAssetsCommand)
     aioLogger.debug(`add web-assets with flags: ${JSON.stringify(flags)}`)
 
-    const projectName = this.getFullConfig().packagejson.name
+    const projectName = (await this.getFullConfig()).packagejson.name
     // guaranteed to have at least one, otherwise would throw in config load or in matching the ext name
-    const entries = Object.entries(this.getAppExtConfigs(flags))
+    const entries = Object.entries(await this.getAppExtConfigs(flags))
     if (entries.length > 1) {
       this.error('Please use the \'-e\' flag to specify to which implementation you want to add web-assets to.')
     }

package/src/commands/app/build.js

@@ -15,7 +15,7 @@ const chalk = require('chalk')
 
 const BaseCommand = require('../../BaseCommand')
 const { Flags } = require('@oclif/core')
-const { runScript, writeConfig } = require('../../lib/app-helper')
+const { runInProcess, writeConfig } = require('../../lib/app-helper')
 const RuntimeLib = require('@adobe/aio-lib-runtime')
 const { bundle } = require('@adobe/aio-lib-web')
 const fs = require('fs-extra')
@@ -28,7 +28,7 @@ class Build extends BaseCommand {
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags.action
 
-    const buildConfigs = this.getAppExtConfigs(flags)
+    const buildConfigs = await this.getAppExtConfigs(flags)
 
     // 1. build actions and web assets for each extension
     const keys = Object.keys(buildConfigs)
@@ -64,7 +64,7 @@ class Build extends BaseCommand {
 
     const filterActions = flags.action
     try {
-      await runScript(config.hooks['pre-app-build'])
+      await runInProcess(config.hooks['pre-app-build'], config)
     } catch (err) {
       this.log(err)
     }
@@ -73,7 +73,7 @@ class Build extends BaseCommand {
       if (config.app.hasBackend && (flags['force-build'] || !fs.existsSync(config.actions.dist))) {
         try {
           let builtList = []
-          const script = await runScript(config.hooks['build-actions'])
+          const script = await runInProcess(config.hooks['build-actions'], config)
           aioLogger.debug(`run hook for 'build-actions' for actions in '${name}' returned ${script}`)
           spinner.start(`Building actions for '${name}'`)
           if (!script) {
@@ -105,7 +105,7 @@ class Build extends BaseCommand {
         }
         spinner.start('Building web assets')
         try {
-          const script = await runScript(config.hooks['build-static'])
+          const script = await runInProcess(config.hooks['build-static'], config)
           if (script) {
             spinner.fail(chalk.green(`build-static skipped by hook '${name}'`))
           } else {
@@ -129,7 +129,7 @@ class Build extends BaseCommand {
       }
     }
     try {
-      await runScript(config.hooks['post-app-build'])
+      await runInProcess(config.hooks['post-app-build'], config)
     } catch (err) {
       this.log(err)
     }

package/src/commands/app/config/get/log-forwarding/errors.js

@@ -30,7 +30,7 @@ class ErrorsCommand extends BaseCommand {
   }
 
   async getLogForwarding () {
-    const runtimeConfig = this.getFullConfig().aio.runtime
+    const runtimeConfig = (await this.getFullConfig()).aio.runtime
     rtLib.utils.checkOpenWhiskCredentials({ ow: runtimeConfig })
     const rt = await rtLib.init({
       ...runtimeConfig,

package/src/commands/app/config/get/log-forwarding.js

@@ -14,7 +14,7 @@ const LogForwarding = require('../../../../lib/log-forwarding')
 
 class LogForwardingCommand extends BaseCommand {
   async run () {
-    const lf = await LogForwarding.init(this.getFullConfig().aio)
+    const lf = await LogForwarding.init((await this.getFullConfig()).aio)
 
     const localConfig = lf.getLocalConfig()
     const serverConfig = await lf.getServerConfig()

package/src/commands/app/config/set/log-forwarding.js

@@ -14,7 +14,7 @@ const LogForwarding = require('../../../../lib/log-forwarding')
 
 class LogForwardingCommand extends BaseCommand {
   async run () {
-    const lf = await LogForwarding.init(this.getFullConfig().aio)
+    const lf = await LogForwarding.init((await this.getFullConfig()).aio)
 
     const destination = await this.promptDestination(lf.getSupportedDestinations())
     const destinationSettingsConfig = lf.getSettingsConfig(destination)

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

@@ -30,8 +30,8 @@ class DeleteActionCommand extends BaseCommand {
       this.error('<action-name> must also be provided when using --yes')
     }
 
-    const fullConfig = this.getFullConfig()
-    const { actions, actionsByImpl } = this.getAllActions(fullConfig)
+    const fullConfig = await this.getFullConfig()
+    const { actions, actionsByImpl } = await this.getAllActions(fullConfig)
     if (actions.length <= 0) {
       this.error('There are no actions in this project!')
     }
@@ -108,17 +108,20 @@ class DeleteActionCommand extends BaseCommand {
     )))
   }
 
-  getAllActions (config) {
+  async getAllActions (config) {
     const actions = []
     const actionsByImpl = {}
-    Object.entries(config.all).forEach(([implName, implConfig]) => {
+    const allConfigEntries = Object.entries(config.all)
+    for (const [implName, implConfig] of allConfigEntries) {
       if (implConfig.app.hasBackend) {
         actionsByImpl[implName] = []
-        Object.entries(implConfig.manifest.full.packages).forEach(([pkgName, pkg]) => {
-          Object.entries(pkg.actions).forEach(([actionName, action]) => {
+        const allPackagesEntries = Object.entries(implConfig.manifest.full.packages)
+        for (const [pkgName, pkg] of allPackagesEntries) {
+          const actionEntries = Object.entries(pkg.actions)
+          for (const [actionName, action] of actionEntries) {
             const fullActionName = `${pkgName}/${actionName}`
             const startKey = implName === 'application' ? 'application' : `extensions.${implName}`
-            const configData = this.getConfigFileForKey(`${startKey}.runtimeManifest.packages.${pkgName}.actions.${actionName}`)
+            const configData = await this.getConfigFileForKey(`${startKey}.runtimeManifest.packages.${pkgName}.actions.${actionName}`)
             const actionObj = {
               // assumes path is not relative
               path: action.function,
@@ -131,12 +134,12 @@ class DeleteActionCommand extends BaseCommand {
             }
             actions.push(actionObj)
             actionsByImpl[implName].push(actionObj)
-          })
-        })
+          }
+        }
       } else {
         aioLogger.debug(`'${implName}' .app.hasBackend is not true`)
       }
-    })
+    }
     return { actions, actionsByImpl }
   }
 }

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

@@ -28,7 +28,7 @@ class DeleteExtensionCommand extends BaseCommand {
       this.error('--extension= must also be provided when using --yes')
     }
 
-    const fullConfig = this.getFullConfig({ allowNoImpl: true })
+    const fullConfig = await this.getFullConfig({ allowNoImpl: true })
     const configs = await this.selectOrGetConfigsToDelete(flags, fullConfig)
 
     const resConfirm = await this.prompt([
@@ -68,11 +68,11 @@ class DeleteExtensionCommand extends BaseCommand {
       }])
       flags.extension = answers.res
     }
-    return this.getAppExtConfigs(flags)
+    return await this.getAppExtConfigs(flags)
   }
 
-  deleteImplementations (configs) {
-    Object.entries(configs).forEach(([id, c]) => {
+  async deleteImplementations (configs) {
+    for (const [id, c] of Object.entries(configs)) {
       // delete actions
       if (c.app.hasBackend) {
         fs.removeSync(c.actions.src)
@@ -89,14 +89,14 @@ class DeleteExtensionCommand extends BaseCommand {
       // delete config
       // try to find another config file => case of init extension in another folder
       const configKey = id === 'application' ? 'application' : `extensions.${id}`
-      const configDataOp = this.getConfigFileForKey(configKey + '.operations')
+      const configDataOp = await this.getConfigFileForKey(configKey + '.operations')
       if (configDataOp.file) {
         fs.removeSync(configDataOp.file)
       }
       // delete config in parent config file
-      const configData = this.getConfigFileForKey(configKey)
+      const configData = await this.getConfigFileForKey(configKey)
       deleteUserConfig(configData)
-    })
+    }
   }
 }
 

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

@@ -25,7 +25,7 @@ class DeleteWebAssetsCommand extends BaseCommand {
 
     aioLogger.debug(`deleting web assets from the project, using flags: ${JSON.stringify(flags)}`)
 
-    const fullConfig = this.getFullConfig()
+    const fullConfig = await this.getFullConfig()
     const webAssetsByImpl = this.getAllWebAssets(fullConfig)
     if (!webAssetsByImpl) {
       this.error('web-assets not found')

package/src/commands/app/deploy.js

@@ -17,7 +17,7 @@ const BaseCommand = require('../../BaseCommand')
 const BuildCommand = require('./build')
 const webLib = require('@adobe/aio-lib-web')
 const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
-const { createWebExportFilter, runScript, buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata } = require('../../lib/app-helper')
+const { createWebExportFilter, runInProcess, buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
 
@@ -30,7 +30,7 @@ class Deploy extends BuildCommand {
     flags['web-assets'] = flags['web-assets'] && !flags.action
     flags.publish = flags.publish && !flags.action
 
-    const deployConfigs = this.getAppExtConfigs(flags)
+    const deployConfigs = await this.getAppExtConfigs(flags)
     const keys = Object.keys(deployConfigs)
     const values = Object.values(deployConfigs)
     const isStandaloneApp = (keys.length === 1 && keys[0] === 'application')
@@ -51,13 +51,11 @@ class Deploy extends BuildCommand {
     const spinner = ora()
 
     try {
-      const aioConfig = this.getFullConfig().aio
+      const aioConfig = (await this.getFullConfig()).aio
 
       // 1. update log forwarding configuration
       // note: it is possible that .aio file does not exist, which means there is no local lg config
-      if (aioConfig &&
-          aioConfig.project &&
-          aioConfig.project.workspace &&
+      if (aioConfig?.project?.workspace &&
           flags['log-forwarding-update'] &&
           flags.actions) {
         spinner.start('Updating log forwarding configuration')
@@ -142,18 +140,17 @@ class Deploy extends BuildCommand {
     const filterActions = flags.action
 
     try {
-      await runScript(config.hooks['pre-app-deploy'])
-
+      await runInProcess(config.hooks['pre-app-deploy'], config)
       if (flags['feature-event-hooks']) {
         this.log('feature-event-hooks is enabled, running pre-deploy-event-reg hook')
-        const hookResults = await this.config.runHook('pre-deploy-event-reg', { appConfig: config })
+        const hookResults = await this.config.runHook('pre-deploy-event-reg', { appConfig: config, force: flags['force-events'] })
         if (hookResults?.failures?.length > 0) {
           // output should be "Error : <plugin-name> : <error-message>\n" for each failure
           this.error(hookResults.failures.map(f => `${f.plugin.name} : ${f.error.message}`).join('\nError: '), { exit: 1 })
         }
       }
     } catch (err) {
-      this.log(err)
+      this.error(err)
     }
 
     if (flags.actions) {
@@ -165,7 +162,7 @@ class Deploy extends BuildCommand {
         const message = `Deploying actions for '${name}'`
         spinner.start(message)
         try {
-          const script = await runScript(config.hooks['deploy-actions'])
+          const script = await runInProcess(config.hooks['deploy-actions'], config)
           if (!script) {
             const hookResults = await this.config.runHook('deploy-actions', {
               appConfig: config,
@@ -202,7 +199,7 @@ class Deploy extends BuildCommand {
         const message = `Deploying web assets for '${name}'`
         spinner.start(message)
         try {
-          const script = await runScript(config.hooks['deploy-static'])
+          const script = await runInProcess(config.hooks['deploy-static'], config)
           if (script) {
             spinner.fail(chalk.green(`deploy-static skipped by hook '${name}'`))
           } else {
@@ -251,17 +248,17 @@ class Deploy extends BuildCommand {
     }
 
     try {
-      await runScript(config.hooks['post-app-deploy'])
+      await runInProcess(config.hooks['post-app-deploy'], config)
       if (flags['feature-event-hooks']) {
         this.log('feature-event-hooks is enabled, running post-deploy-event-reg hook')
-        const hookResults = await this.config.runHook('post-deploy-event-reg', { appConfig: config })
+        const hookResults = await this.config.runHook('post-deploy-event-reg', { appConfig: config, force: flags['force-events'] })
         if (hookResults?.failures?.length > 0) {
           // output should be "Error : <plugin-name> : <error-message>\n" for each failure
           this.error(hookResults.failures.map(f => `${f.plugin.name} : ${f.error.message}`).join('\nError: '), { exit: 1 })
         }
       }
     } catch (err) {
-      this.log(err)
+      this.error(err)
     }
   }
 
@@ -354,6 +351,13 @@ Deploy.flags = {
     default: false,
     exclusive: ['action', 'publish'] // no-publish is excluded
   }),
+  'force-events': Flags.boolean({
+    description: '[default: false] Force event registrations and overwrite any previous registrations',
+    default: false,
+    allowNo: true,
+    dependsOn: ['feature-event-hooks'],
+    exclusive: ['action', 'publish'] // no-publish is excluded
+  }),
   'web-optimize': Flags.boolean({
     description: '[default: false] Enable optimization (minification) of web js/css/html',
     default: false

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

@@ -31,7 +31,7 @@ class GetUrlCommand extends BaseCommand {
       options.cdn = flags.cdn
 
       const urls = {}
-      const fullConfig = this.getFullConfig()
+      const fullConfig = await this.getFullConfig()
       if (options.action) {
         let action
         // search for action

package/src/commands/app/info.js

@@ -19,7 +19,7 @@ class Info extends BaseCommand {
   async run () {
     // cli input
     const { flags } = await this.parse(Info)
-    const appConfig = deepCopy(this.getFullConfig({ allowNoImpl: true }))
+    const appConfig = deepCopy(await this.getFullConfig({ allowNoImpl: true }))
 
     // includes .env secret delete all aio config for now
     delete appConfig.aio

package/src/commands/app/install.js

@@ -22,6 +22,7 @@ const jsYaml = require('js-yaml')
 const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE } = require('../../lib/defaults')
 const ora = require('ora')
 const chalk = require('chalk')
+const libAppConfig = require('@adobe/aio-cli-lib-app-config')
 
 class InstallCommand extends BaseCommand {
   async run () {
@@ -49,8 +50,9 @@ class InstallCommand extends BaseCommand {
     try {
       await this.validateZipDirectoryStructure(args.path)
       await this.unzipFile(args.path, outputPath)
-      await this.validateConfig(outputPath, USER_CONFIG_FILE)
-      await this.validateConfig(outputPath, DEPLOY_CONFIG_FILE)
+      // first coalesce the app config (resolving $include files), then validate it
+      await libAppConfig.validate(await libAppConfig.coalesce(USER_CONFIG_FILE))
+      await this.validateConfig(outputPath, DEPLOY_CONFIG_FILE, { throws: true })
       await this.npmInstall(flags.verbose)
       await this.runTests()
       this.spinner.succeed('Install done.')

package/src/commands/app/list/extension-points.js

@@ -22,7 +22,7 @@ class ListExtensionPointsCommand extends BaseCommand {
     const { flags } = await this.parse(ListExtensionPointsCommand)
     aioLogger.debug(`list all extensions points with flags: ${JSON.stringify(flags)}`)
 
-    const extConfig = this.getAppExtConfigs(flags)
+    const extConfig = await this.getAppExtConfigs(flags)
     const extPointList = {}
 
     Object.keys(extConfig).forEach(name => {

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

@@ -22,7 +22,7 @@ class ListExtensionCommand extends BaseCommand {
     const { flags } = await this.parse(ListExtensionCommand)
     aioLogger.debug(`list extensions with flags: ${JSON.stringify(flags)}`)
 
-    const extConfig = this.getAppExtConfigs(flags)
+    const extConfig = await this.getAppExtConfigs(flags)
     const extSummary = {}
 
     Object.keys(extConfig).forEach(extPoint => {

package/src/commands/app/logs.js

@@ -36,7 +36,7 @@ class Logs extends BaseCommand {
 
   async run () {
     const { flags } = await this.parse(Logs)
-    const fullConfig = this.getFullConfig()
+    const fullConfig = await this.getFullConfig()
 
     // has any backend
     const hasAnyBackend = Object.values(fullConfig.all).reduce((hasBackend, config) => hasBackend && config.app.hasBackend, true)

package/src/commands/app/pack.js

@@ -37,7 +37,8 @@ class Pack extends BaseCommand {
     aioLogger.debug(`flags: ${JSON.stringify(flags, null, 2)}`)
     aioLogger.debug(`args: ${JSON.stringify(args, null, 2)}`)
 
-    const appConfig = this.getFullConfig()
+    // NOTE: this will validate the app config file behind the scene
+    const appConfig = await this.getFullConfig()
 
     // resolve to absolute path before any chdir
     const outputZipFile = path.resolve(flags.output)

package/src/commands/app/run.js

@@ -22,7 +22,7 @@ const coreConfig = require('@adobe/aio-lib-core-config')
 const BaseCommand = require('../../BaseCommand')
 const runDev = require('../../lib/run-dev')
 const { defaultHttpServerPort: SERVER_DEFAULT_PORT } = require('../../lib/defaults')
-const { runScript } = require('../../lib/app-helper')
+const { runInProcess } = require('../../lib/app-helper')
 
 const DEV_KEYS_DIR = 'dist/dev-keys/'
 const PRIVATE_KEY_PATH = DEV_KEYS_DIR + 'private.key'
@@ -36,7 +36,7 @@ class Run extends BaseCommand {
 
     const spinner = ora()
 
-    const runConfigs = this.getAppExtConfigs(flags)
+    const runConfigs = await this.getAppExtConfigs(flags)
     const entries = Object.entries(runConfigs)
     if (entries.length > 1) {
       this.error('Your app implements multiple extensions. You can only run one at the time, please select which extension to run with the \'-e\' flag.')
@@ -80,7 +80,7 @@ class Run extends BaseCommand {
     }
 
     try {
-      await runScript(config.hooks['pre-app-run'])
+      await runInProcess(config.hooks['pre-app-run'], { config, options: runOptions })
     } catch (err) {
       this.log(err)
     }
@@ -107,7 +107,7 @@ class Run extends BaseCommand {
     const inprocHook = this.config.runHook.bind(this.config)
     const frontendUrl = await runDev(config, this.config.dataDir, runOptions, onProgress, inprocHook)
     try {
-      await runScript(config.hooks['post-app-run'])
+      await runInProcess(config.hooks['post-app-run'], config)
     } catch (err) {
       this.log(err)
     }

package/src/commands/app/test.js

@@ -31,7 +31,7 @@ class Test extends BaseCommand {
       unit = true
     }
 
-    const buildConfigs = this.getAppExtConfigs({ extension })
+    const buildConfigs = await this.getAppExtConfigs({ extension })
     aioLogger.debug(`run buildConfigs:${JSON.stringify(buildConfigs, null, 2)}`)
 
     const totalResults = []

package/src/commands/app/undeploy.js

@@ -18,7 +18,7 @@ const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const webLib = require('@adobe/aio-lib-web')
-const { runScript, buildExtensionPointPayloadWoMetadata } = require('../../lib/app-helper')
+const { runInProcess, buildExtensionPointPayloadWoMetadata } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 
 class Undeploy extends BaseCommand {
@@ -26,7 +26,7 @@ class Undeploy extends BaseCommand {
     // cli input
     const { flags } = await this.parse(Undeploy)
 
-    const undeployConfigs = this.getAppExtConfigs(flags)
+    const undeployConfigs = await this.getAppExtConfigs(flags)
     let libConsoleCLI
     if (flags.unpublish) {
       // force login at beginning (if required)
@@ -52,7 +52,7 @@ class Undeploy extends BaseCommand {
       }
       // 2. unpublish extension manifest
       if (flags.unpublish && !(keys.length === 1 && keys[0] === 'application')) {
-        const aioConfig = this.getFullConfig().aio
+        const aioConfig = (await this.getFullConfig()).aio
         const payload = await this.unpublishExtensionPoints(libConsoleCLI, undeployConfigs, aioConfig, flags['force-unpublish'])
         this.log(chalk.blue(chalk.bold(`New Extension Point(s) in Workspace '${aioConfig.project.workspace.name}': '${Object.keys(payload.endpoints)}'`)))
       } else {
@@ -78,7 +78,7 @@ class Undeploy extends BaseCommand {
       }
     // undeploy
     try {
-      await runScript(config.hooks['pre-app-undeploy'])
+      await runInProcess(config.hooks['pre-app-undeploy'], config)
     } catch (err) {
       this.log(err)
     }
@@ -86,7 +86,8 @@ class Undeploy extends BaseCommand {
     if (flags.actions) {
       if (config.app.hasBackend) {
         try {
-          const script = await runScript(config.hooks['undeploy-actions'])
+          this.config.runHook('pre-undeploy-event-reg', { appConfig: config })
+          const script = await runInProcess(config.hooks['undeploy-actions'], config)
           if (!script) {
             await rtLib.undeployActions(config)
           }
@@ -102,7 +103,7 @@ class Undeploy extends BaseCommand {
     if (flags['web-assets']) {
       if (config.app.hasFrontend) {
         try {
-          const script = await runScript(config.hooks['undeploy-static'])
+          const script = await runInProcess(config.hooks['undeploy-static'], config)
           if (!script) {
             await webLib.undeployWeb(config, onProgress)
           }
@@ -117,7 +118,8 @@ class Undeploy extends BaseCommand {
     }
 
     try {
-      await runScript(config.hooks['post-app-undeploy'])
+      this.config.runHook('post-undeploy-event-reg', { appConfig: config })
+      await runInProcess(config.hooks['post-app-undeploy'], config)
       if (flags['feature-event-hooks'] && flags.events) {
         this.log('feature-event-hooks is enabled, running post-undeploy-event-reg hook')
         const hookResults = await this.config.runHook('post-undeploy-event-reg', { appConfig: config })

package/src/lib/app-helper.js

@@ -66,7 +66,12 @@ async function installPackages (dir, options = { spinner: null, verbose: false }
   return ret
 }
 
-/** @private */
+// Is this still used? it is exported, but there are no references to it -jm
+/**
+ * @param {string} scriptName  npm script name
+ * @param {string} dir directory to run npm script in
+ * @param {string[]} cmdArgs args to pass to npm script
+ */
 async function runPackageScript (scriptName, dir, cmdArgs = []) {
   aioLogger.debug(`running npm run-script ${scriptName} in dir: ${dir}`)
   const pkg = await fs.readJSON(path.join(dir, 'package.json'))
@@ -79,7 +84,39 @@ async function runPackageScript (scriptName, dir, cmdArgs = []) {
   }
 }
 
-/** @private */
+/**
+ *
+ * @param {string} hookPath to be require()'d and run. Should export an async function that takes a config object as its only argument
+ * @param {object} config which will be passed to the hook
+ * @returns {Promise<*>} whatever the hook returns
+ */
+async function runInProcess (hookPath, config) {
+  if (hookPath) {
+    try {
+      const hook = require(path.resolve(hookPath))
+      aioLogger.debug('runInProcess: running project hook in process')
+      return hook(config)
+    } catch (e) {
+      aioLogger.debug('runInProcess: error running project hook in process, running as package script instead')
+      return runScript(hookPath)
+    }
+  } else {
+    aioLogger.debug('runInProcess: undefined hookPath')
+  }
+}
+
+/**
+ * @typedef ChildProcess
+ */
+
+/**
+ * Runs a package script in a child process
+ *
+ * @param {string} command to run
+ * @param {string} dir to run command in
+ * @param {string[]} cmdArgs args to pass to command
+ * @returns {Promise<ChildProcess>} child process
+ */
 async function runScript (command, dir, cmdArgs = []) {
   if (!command) {
     return null
@@ -536,6 +573,7 @@ module.exports = {
   isGitInstalled,
   installPackages,
   runScript,
+  runInProcess,
   runPackageScript,
   wrapError,
   getCliInfo,

package/src/lib/build-actions.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const utils = require('./app-helper')
+const { runInProcess } = require('./app-helper')
 const { buildActions } = require('@adobe/aio-lib-runtime')
 
 /**
@@ -21,10 +21,10 @@ const { buildActions } = require('@adobe/aio-lib-runtime')
  * @param {boolean} [forceBuild=false] force a build (skip file changed hash check)
  */
 module.exports = async (config, filterActions, forceBuild = false) => {
-  utils.runScript(config.hooks['pre-app-build'])
-  const script = await utils.runScript(config.hooks['build-actions'])
+  await runInProcess(config.hooks['pre-app-build'], config)
+  const script = await runInProcess(config.hooks['build-actions'], { config, options: { filterActions, forceBuild } })
   if (!script) {
     await buildActions(config, filterActions, forceBuild)
   }
-  utils.runScript(config.hooks['post-app-build'])
+  await runInProcess(config.hooks['post-app-build'], config)
 }

package/src/lib/deploy-actions.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const utils = require('./app-helper')
+const { runInProcess, createWebExportFilter } = require('./app-helper')
 const { deployActions } = require('@adobe/aio-lib-runtime')
 
 /**
@@ -23,8 +23,8 @@ const { deployActions } = require('@adobe/aio-lib-runtime')
  */
 /** @private */
 module.exports = async (config, isLocalDev = false, log = () => {}, filter = false, inprocHook) => {
-  utils.runScript(config.hooks['pre-app-deploy'])
-  const script = await utils.runScript(config.hooks['deploy-actions'])
+  await runInProcess(config.hooks['pre-app-deploy'], config)
+  const script = await runInProcess(config.hooks['deploy-actions'], { config, options: { isLocalDev, filter } })
   if (!script) {
     const deployConfig = {
       isLocalDev,
@@ -47,8 +47,8 @@ module.exports = async (config, isLocalDev = false, log = () => {}, filter = fal
     }
     const entities = await deployActions(config, deployConfig, log)
     if (entities.actions) {
-      const web = entities.actions.filter(utils.createWebExportFilter(true))
-      const nonWeb = entities.actions.filter(utils.createWebExportFilter(false))
+      const web = entities.actions.filter(createWebExportFilter(true))
+      const nonWeb = entities.actions.filter(createWebExportFilter(false))
 
       if (web.length > 0) {
         log('web actions:')
@@ -65,5 +65,5 @@ module.exports = async (config, isLocalDev = false, log = () => {}, filter = fal
       }
     }
   }
-  utils.runScript(config.hooks['post-app-deploy'])
+  await runInProcess(config.hooks['post-app-deploy'], config)
 }

package/schema/app.config.yaml.schema.json

@@ -1,157 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://adobe.io/schemas/app-builder/app.config.yaml.json/v1",
-  "type": "object",
-  "properties": {
-    "application": { "$ref": "#/definitions/application" },
-    "extensions": { "$ref": "#/definitions/extensions" }
-  },
-  "oneOf": [
-    {
-      "required": ["application"],
-      "allOf": [
-        { "not": { "required": ["extensions"] } }
-      ]
-    },
-    {
-      "required": ["extensions"],
-      "allOf": [
-        { "not": { "required": ["application"] } }
-      ]
-    }
-  ],
-  "definitions": {
-    "application": {
-      "type": "object",
-      "properties": {
-        "runtimeManifest": { "$ref": "#/definitions/runtimeManifest" },
-        "actions": { "type": "string" },
-        "unitTest": { "type": "string" },
-        "e2eTest": { "type": "string" },
-        "dist": { "type": "string" },
-        "tvmurl": { "type": "string" },
-        "awsaccesskeyid": { "type": "string" },
-        "awssecretaccesskey": { "type": "string" },
-        "s3bucket": { "type": "string" },
-        "events": { "type": "object" },
-        "hostname": { "type": "string" },
-        "htmlcacheduration": { "type": "number" },
-        "jscacheduration": { "type": "number" },
-        "csscacheduration": { "type": "number" },
-        "imagecacheduration": { "type": "number" },
-        "hooks": { "$ref": "#/definitions/hooks" },
-        "web": { "$ref": "#/definitions/web" }
-      },
-      "required": ["runtimeManifest"]
-    },
-    "extensions": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_/\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/extension"
-        }
-      },
-      "additionalProperties": false
-    },
-    "extension": {
-      "type": "object",
-      "properties": {
-        "$include": { "type": "string" }
-      }
-    },
-    "web": {
-      "anyOf": [
-        {
-          "type": "string"
-        }, 
-        {
-          "type": "object",
-          "properties": {
-            "response-headers": { "type": "object" }
-          }
-        }
-      ]
-    },
-    "runtimeManifest": {
-      "type": "object",
-      "properties": {
-        "packages": { "$ref": "#/definitions/packages" }
-      },
-      "required": ["packages"]
-    },
-    "packages": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/package"
-        }
-      },
-      "additionalProperties": false
-    },
-    "package": {
-      "type": "object",
-      "properties": {
-        "license": { "type": "string" },
-        "actions": { "$ref": "#/definitions/actions" }
-      }
-    },
-    "actions": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/action"
-        }
-      },
-      "additionalProperties": false
-    },
-    "action": {
-      "type": "object",
-      "properties": {
-        "function": { "type": "string" },
-        "web": { "type": "string" },
-        "runtime": { "type": "string" },
-        "inputs": { "$ref": "#/definitions/inputs" },
-        "annotations": { "$ref": "#/definitions/annotations" }
-      },
-      "required": ["function", "runtime"]
-    },
-    "inputs": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "type": ["string", "boolean"]
-        }
-      },
-      "additionalProperties": false
-    },
-    "annotations": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "type": ["string", "boolean"]
-        }
-      },
-      "additionalProperties": false
-    },
-    "hooks": {
-      "type": "object",
-      "properties": {
-        "pre-app-build": { "type": "string" },
-        "post-app-build": { "type": "string" },
-        "build-actions": { "type": "string" },
-        "build-static": { "type": "string" },
-        "pre-app-deploy": { "type": "string" },
-        "post-app-deploy": { "type": "string" },
-        "deploy-actions": { "type": "string" },
-        "deploy-static": { "type": "string" },
-        "pre-app-undeploy": { "type": "string" },
-        "post-app-undeploy": { "type": "string" },
-        "undeploy-actions": { "type": "string" },
-        "undeploy-static": { "type": "string" },
-        "pre-app-run": { "type": "string" },
-        "post-app-run": { "type": "string" },
-        "serve-static": { "type": "string" }
-      }
-    }
-  }
-}