@adobe/aio-cli-plugin-app 10.0.4 → 10.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.0.4",
+  "version": "10.1.0",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
@@ -15,7 +15,7 @@
     "@adobe/aio-lib-runtime": "^5.0.0",
     "@adobe/aio-lib-templates": "^2.2.0",
     "@adobe/aio-lib-web": "^6.0.1",
-    "@adobe/generator-aio-app": "^4.0.0",
+    "@adobe/generator-aio-app": "^5.1.0",
     "@adobe/generator-app-common-lib": "^0.3.3",
     "@adobe/inquirer-table-checkbox": "^1.2.0",
     "@oclif/core": "^1.15.0",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@adobe/aio-lib-test-proxy": "^1.0.0",
     "@adobe/eslint-config-aio-lib-config": "^2.0.0",
-    "@types/jest": "^28",
+    "@types/jest": "^29",
     "babel-runtime": "^6.26.0",
     "core-js": "^3",
     "eol": "^0.9.1",
@@ -95,7 +95,7 @@
     "prepack": "oclif manifest && oclif readme --no-aliases",
     "test": "npm run unit-tests && npm run lint",
     "unit-tests": "jest -c jest.config.js",
-    "version": "oclif readme && git add README.md",
+    "version": "oclif readme --no-aliases && git add README.md",
     "update-openwhisk-runtimes": "node bin/openwhisk-standalone-config/get-runtimes.js > bin/openwhisk-standalone-config/runtimes.json"
   },
   "bin": {

package/src/TemplatesCommand.js

@@ -150,6 +150,14 @@ class TemplatesCommand extends AddCommand {
   } = {}) {
     const spinner = ora()
 
+    if (templates.length <= 0) {
+      aioLogger.debug('installTemplates: standalone-app')
+      await this.config.runHook('telemetry', { data: 'installTemplates:standalone-app' })
+    } else {
+      aioLogger.debug(`installTemplates: ${templates}`)
+      await this.config.runHook('telemetry', { data: `installTemplates:${templates}` })
+    }
+
     // install the templates in sequence
     for (const template of templates) {
       spinner.info(`Installing template ${template}`)

package/src/commands/app/deploy.js

@@ -37,7 +37,7 @@ class Deploy extends BuildCommand {
 
     // if there are no extensions, then set publish to false
     flags.publish = flags.publish && !isStandaloneApp
-    let libConsoleCLI
+    let libConsoleCLI // <= this can be undefined later on, and it was not checked
     if (flags.publish) {
       // force login at beginning (if required)
       libConsoleCLI = await this.getLibConsoleCLI()
@@ -158,6 +158,11 @@ class Deploy extends BuildCommand {
         try {
           const script = await runScript(config.hooks['deploy-actions'])
           if (!script) {
+            await this.config.runHook('deploy-actions', {
+              appConfig: config,
+              filterEntities: filterActions || [],
+              isLocalDev: false
+            })
             deployedRuntimeEntities = await rtLib.deployActions(config, { filterEntities }, onProgress)
           }
 

package/src/commands/app/run.js

@@ -104,8 +104,8 @@ class Run extends BaseCommand {
         spinner.info(chalk.dim(`${info}`))
         spinner.start()
       }
-
-    const frontendUrl = await runDev(config, this.config.dataDir, runOptions, onProgress)
+    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'])
     } catch (err) {

package/src/lib/actions-watcher.js

@@ -61,10 +61,9 @@ module.exports = async (watcherOptions) => {
  * @param {Array<string>} filterActions add filters to deploy only specified OpenWhisk actions
  */
 async function buildAndDeploy (watcherOptions, filterActions) {
-  const { config, isLocal, log } = watcherOptions
-
+  const { config, isLocal, log, inprocHook } = watcherOptions
   await buildActions(config, filterActions)
-  await deployActions(config, isLocal, log, filterActions)
+  await deployActions(config, isLocal, log, filterActions, inprocHook)
 }
 
 /**

package/src/lib/deploy-actions.js

@@ -22,7 +22,7 @@ const { deployActions } = require('@adobe/aio-lib-runtime')
  * @param {boolean} filter true if a filter by built actions is desired.
  */
 /** @private */
-module.exports = async (config, isLocalDev = false, log = () => {}, filter = false) => {
+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'])
   if (!script) {
@@ -32,6 +32,14 @@ module.exports = async (config, isLocalDev = false, log = () => {}, filter = fal
         byBuiltActions: filter
       }
     }
+    if (inprocHook) {
+      const hookFilterEntities = Array.isArray(filter) ? filter : []
+      await inprocHook('deploy-actions', {
+        appConfig: config,
+        filterEntities: hookFilterEntities,
+        isLocalDev
+      })
+    }
     const entities = await deployActions(config, deployConfig, log)
     if (entities.actions) {
       const web = entities.actions.filter(utils.createWebExportFilter(true))

package/src/lib/run-dev.js

@@ -30,7 +30,7 @@ const { run: logPoller } = require('./log-poller')
 const getPort = require('get-port')
 
 /** @private */
-async function runDev (config, dataDir, options = {}, log = () => {}) {
+async function runDev (config, dataDir, options = {}, log = () => {}, inprocHook) {
   /* parcel bundle options */
   const bundleOptions = {
     shouldDisableCache: true,
@@ -38,6 +38,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
     shouldOptimize: false,
     ...options.parcel
   }
+
   /* skip actions */
   const skipActions = !!options.skipActions
   /* fetch logs for actions option */
@@ -48,6 +49,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
   const withBackend = config.app.hasBackend && !skipActions
   const isLocal = options.isLocal // applies only for backend
   const portToUse = parseInt(process.env.PORT) || SERVER_DEFAULT_PORT
+
   const uiPort = await getPort({ port: portToUse })
   if (uiPort !== portToUse) {
     log(`Could not use port:${portToUse}, using port:${uiPort} instead`)
@@ -82,7 +84,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
       log('building actions..')
       await buildActions(devConfig, null, true /* force build */)
 
-      const { cleanup: watcherCleanup } = await actionsWatcher({ config: devConfig, isLocal, log })
+      const { cleanup: watcherCleanup } = await actionsWatcher({ config: devConfig, isLocal, log, inprocHook })
       cleanup.add(() => watcherCleanup(), 'stopping action watcher...')
     }
 
@@ -121,7 +123,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
     // Deploy Phase - deploy actions
     if (withBackend) {
       log('redeploying actions..')
-      await deployActions(devConfig, isLocal, log, true)
+      await deployActions(devConfig, isLocal, log, true, inprocHook)
     }
 
     // Deploy Phase - serve the web UI