@adobe/aio-cli-plugin-app 10.7.2 → 11.0.0

package/README.md

@@ -39,7 +39,6 @@ $ aio app --help
 * [`aio app delete`](#aio-app-delete)
 * [`aio app delete action [ACTION-NAME]`](#aio-app-delete-action-action-name)
 * [`aio app delete ci`](#aio-app-delete-ci)
-* [`aio app delete event [EVENT-ACTION-NAME]`](#aio-app-delete-event-event-action-name)
 * [`aio app delete extension`](#aio-app-delete-extension)
 * [`aio app delete service`](#aio-app-delete-service)
 * [`aio app delete web-assets`](#aio-app-delete-web-assets)
@@ -71,7 +70,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/index.ts)_
 
 ## `aio app add`
 
@@ -89,7 +88,7 @@ DESCRIPTION
   Add a new component to an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/add/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/index.ts)_
+_See code: [src/commands/app/add/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/index.ts)_
 
 ## `aio app add action`
 
@@ -114,7 +113,7 @@ ALIASES
   $ aio app add actions
 ```
 
-_See code: [src/commands/app/add/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/action.ts)_
+_See code: [src/commands/app/add/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/action.ts)_
 
 ## `aio app add ci`
 
@@ -132,7 +131,7 @@ DESCRIPTION
   Add CI files
 ```
 
-_See code: [src/commands/app/add/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/ci.ts)_
+_See code: [src/commands/app/add/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/ci.ts)_
 
 ## `aio app add event`
 
@@ -140,16 +139,14 @@ Add a new Adobe I/O Events action
 
 ```
 USAGE
-  $ aio app add event [-v] [--version] [--install] [-y] [-e <value>] [--experimental-allow-events-templates]
+  $ aio app add event [-v] [--version] [--install] [-y] [-e <value>]
 
 FLAGS
-  -e, --extension=<value>                Add events to a specific extension
-  -v, --verbose                          Verbose output
-  -y, --yes                              Skip questions, and use all default values
-  --experimental-allow-events-templates  Feature flag to enable events templates. NOTE: skip-prompt will have no effect
-                                         if this flag is enabled.
-  --[no-]install                         [default: true] Run npm installation after files are created
-  --version                              Show version
+  -e, --extension=<value>  Add events to a specific extension
+  -v, --verbose            Verbose output
+  -y, --yes                Skip questions, and use all default values
+  --[no-]install           [default: true] Run npm installation after files are created
+  --version                Show version
 
 DESCRIPTION
   Add a new Adobe I/O Events action
@@ -159,7 +156,7 @@ ALIASES
   $ aio app add events
 ```
 
-_See code: [src/commands/app/add/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/event.ts)_
+_See code: [src/commands/app/add/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/event.ts)_
 
 ## `aio app add extension`
 
@@ -185,7 +182,7 @@ ALIASES
   $ aio app add extensions
 ```
 
-_See code: [src/commands/app/add/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/extension.ts)_
+_See code: [src/commands/app/add/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/extension.ts)_
 
 ## `aio app add service`
 
@@ -209,7 +206,7 @@ ALIASES
   $ aio app add services
 ```
 
-_See code: [src/commands/app/add/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/service.ts)_
+_See code: [src/commands/app/add/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/service.ts)_
 
 ## `aio app add web-assets`
 
@@ -230,7 +227,7 @@ DESCRIPTION
   Add web assets support
 ```
 
-_See code: [src/commands/app/add/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/add/web-assets.ts)_
+_See code: [src/commands/app/add/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/add/web-assets.ts)_
 
 ## `aio app build`
 
@@ -259,7 +256,7 @@ DESCRIPTION
   This will always force a rebuild unless --no-force-build is set.
 ```
 
-_See code: [src/commands/app/build.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/build.ts)_
+_See code: [src/commands/app/build.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/build.ts)_
 
 ## `aio app create [PATH]`
 
@@ -281,7 +278,7 @@ DESCRIPTION
   Create a new Adobe I/O App with default parameters
 ```
 
-_See code: [src/commands/app/create.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/create.ts)_
 
 ## `aio app delete`
 
@@ -299,7 +296,7 @@ DESCRIPTION
   Delete a component from an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/delete/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/index.ts)_
+_See code: [src/commands/app/delete/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/index.ts)_
 
 ## `aio app delete action [ACTION-NAME]`
 
@@ -325,7 +322,7 @@ ALIASES
   $ aio app delete actions
 ```
 
-_See code: [src/commands/app/delete/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/action.ts)_
+_See code: [src/commands/app/delete/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/action.ts)_
 
 ## `aio app delete ci`
 
@@ -344,33 +341,7 @@ DESCRIPTION
   Delete existing CI files
 ```
 
-_See code: [src/commands/app/delete/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/ci.ts)_
-
-## `aio app delete event [EVENT-ACTION-NAME]`
-
-Delete existing Adobe I/O Events actions
-
-```
-USAGE
-  $ aio app delete event [EVENT-ACTION-NAME] [-v] [--version] [-y]
-
-ARGUMENTS
-  EVENT-ACTION-NAME  Action `pkg/name` to delete, you can specify multiple actions via a comma separated list
-
-FLAGS
-  -v, --verbose  Verbose output
-  -y, --yes      Skip questions, and use all default values
-  --version      Show version
-
-DESCRIPTION
-  Delete existing Adobe I/O Events actions
-
-
-ALIASES
-  $ aio app delete events
-```
-
-_See code: [src/commands/app/delete/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/event.ts)_
+_See code: [src/commands/app/delete/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/ci.ts)_
 
 ## `aio app delete extension`
 
@@ -396,7 +367,7 @@ ALIASES
   $ aio app delete extensions
 ```
 
-_See code: [src/commands/app/delete/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/extension.ts)_
+_See code: [src/commands/app/delete/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/extension.ts)_
 
 ## `aio app delete service`
 
@@ -420,7 +391,7 @@ ALIASES
   $ aio app delete services
 ```
 
-_See code: [src/commands/app/delete/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/service.ts)_
+_See code: [src/commands/app/delete/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/service.ts)_
 
 ## `aio app delete web-assets`
 
@@ -439,7 +410,7 @@ DESCRIPTION
   Delete existing web assets
 ```
 
-_See code: [src/commands/app/delete/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/delete/web-assets.ts)_
+_See code: [src/commands/app/delete/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/delete/web-assets.ts)_
 
 ## `aio app deploy`
 
@@ -449,7 +420,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]
-    [--force-events ] [--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
@@ -462,7 +433,8 @@ 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
+  --[no-]force-events           [default: false] Force event registrations and delete any registrations not part of the
+                                config file
   --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
@@ -479,7 +451,7 @@ DESCRIPTION
   This will always force a rebuild unless --no-force-build is set.
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/deploy.ts)_
 
 ## `aio app get-url [ACTION]`
 
@@ -502,7 +474,7 @@ DESCRIPTION
   Get action URLs
 ```
 
-_See code: [src/commands/app/get-url.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/get-url.ts)_
+_See code: [src/commands/app/get-url.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/get-url.ts)_
 
 ## `aio app info`
 
@@ -524,7 +496,7 @@ DESCRIPTION
   Display settings/configuration in use by an Adobe I/O App
 ```
 
-_See code: [src/commands/app/info.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/info.ts)_
+_See code: [src/commands/app/info.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/info.ts)_
 
 ## `aio app init [PATH]`
 
@@ -558,7 +530,7 @@ DESCRIPTION
   Create a new Adobe I/O App
 ```
 
-_See code: [src/commands/app/init.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/init.ts)_
+_See code: [src/commands/app/init.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/init.ts)_
 
 ## `aio app list`
 
@@ -576,7 +548,7 @@ DESCRIPTION
   List components for Adobe I/O App
 ```
 
-_See code: [src/commands/app/list/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/list/index.ts)_
+_See code: [src/commands/app/list/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/list/index.ts)_
 
 ## `aio app list extension`
 
@@ -601,7 +573,7 @@ ALIASES
   $ aio app list extensions
 ```
 
-_See code: [src/commands/app/list/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/list/extension.ts)_
+_See code: [src/commands/app/list/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/list/extension.ts)_
 
 ## `aio app logs`
 
@@ -625,7 +597,7 @@ DESCRIPTION
   Fetch logs for an Adobe I/O App
 ```
 
-_See code: [src/commands/app/logs.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/logs.ts)_
+_See code: [src/commands/app/logs.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/logs.ts)_
 
 ## `aio app run`
 
@@ -648,7 +620,7 @@ DESCRIPTION
   Run an Adobe I/O App
 ```
 
-_See code: [src/commands/app/run.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/run.ts)_
+_See code: [src/commands/app/run.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/run.ts)_
 
 ## `aio app test`
 
@@ -676,7 +648,7 @@ DESCRIPTION
   If the extension has a hook called 'test' in its 'ext.config.yaml', the script specified will be run instead.
 ```
 
-_See code: [src/commands/app/test.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/test.ts)_
+_See code: [src/commands/app/test.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/test.ts)_
 
 ## `aio app undeploy`
 
@@ -701,7 +673,7 @@ DESCRIPTION
   Undeploys an Adobe I/O App
 ```
 
-_See code: [src/commands/app/undeploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/undeploy.ts)_
+_See code: [src/commands/app/undeploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/undeploy.ts)_
 
 ## `aio app use [CONFIG_FILE_PATH]`
 
@@ -749,5 +721,5 @@ DESCRIPTION
   page in https://developer.adobe.com/console/
 ```
 
-_See code: [src/commands/app/use.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.2/src/commands/app/use.ts)_
+_See code: [src/commands/app/use.ts](https://github.com/adobe/aio-cli-plugin-app/blob/11.0.0/src/commands/app/use.ts)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "10.7.2",
+  "version": "11.0.0",
   "commands": {
     "app:build": {
       "id": "app:build",
@@ -235,11 +235,8 @@
         "force-events": {
           "name": "force-events",
           "type": "boolean",
-          "description": "[default: false] Force event registrations and overwrite any previous registrations",
+          "description": "[default: false] Force event registrations and delete any registrations not part of the config file",
           "allowNo": true,
-          "dependsOn": [
-            "feature-event-hooks"
-          ],
           "exclusive": [
             "action",
             "publish"
@@ -250,13 +247,6 @@
           "type": "boolean",
           "description": "[default: true] Update log forwarding configuration on server",
           "allowNo": true
-        },
-        "feature-event-hooks": {
-          "name": "feature-event-hooks",
-          "type": "boolean",
-          "description": "[default: false] Enable event hooks feature",
-          "hidden": true,
-          "allowNo": true
         }
       },
       "args": {}
@@ -667,7 +657,7 @@
           "char": "o",
           "description": "The packaged app output file path",
           "multiple": false,
-          "default": "app.zip"
+          "default": "dist/app.zip"
         }
       },
       "args": {
@@ -861,13 +851,6 @@
           "exclusive": [
             "unpublish"
           ]
-        },
-        "feature-event-hooks": {
-          "name": "feature-event-hooks",
-          "type": "boolean",
-          "description": "[default: false] Enable event hooks feature",
-          "hidden": true,
-          "allowNo": true
         }
       },
       "args": {}
@@ -1106,12 +1089,6 @@
           "char": "e",
           "description": "Add events to a specific extension",
           "multiple": false
-        },
-        "experimental-allow-events-templates": {
-          "name": "experimental-allow-events-templates",
-          "type": "boolean",
-          "description": "Feature flag to enable events templates. NOTE: skip-prompt will have no effect if this flag is enabled.",
-          "allowNo": false
         }
       },
       "args": {}
@@ -1368,46 +1345,6 @@
       },
       "args": {}
     },
-    "app:delete:event": {
-      "id": "app:delete:event",
-      "description": "Delete existing Adobe I/O Events actions\n",
-      "strict": true,
-      "pluginName": "@adobe/aio-cli-plugin-app",
-      "pluginAlias": "@adobe/aio-cli-plugin-app",
-      "pluginType": "core",
-      "aliases": [
-        "app:delete:events"
-      ],
-      "flags": {
-        "verbose": {
-          "name": "verbose",
-          "type": "boolean",
-          "char": "v",
-          "description": "Verbose output",
-          "allowNo": false
-        },
-        "version": {
-          "name": "version",
-          "type": "boolean",
-          "description": "Show version",
-          "allowNo": false
-        },
-        "yes": {
-          "name": "yes",
-          "type": "boolean",
-          "char": "y",
-          "description": "Skip questions, and use all default values",
-          "allowNo": false
-        }
-      },
-      "args": {
-        "event-action-name": {
-          "name": "event-action-name",
-          "description": "Action `pkg/name` to delete, you can specify multiple actions via a comma separated list",
-          "required": false
-        }
-      }
-    },
     "app:delete:extension": {
       "id": "app:delete:extension",
       "description": "Delete existing extensions\n",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.7.2",
+  "version": "11.0.0",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
@@ -16,8 +16,8 @@
     "@adobe/aio-lib-runtime": "^5.0.0",
     "@adobe/aio-lib-templates": "^2.2.0",
     "@adobe/aio-lib-web": "^6.1.0",
-    "@adobe/generator-aio-app": "^5.1.0",
-    "@adobe/generator-app-common-lib": "^0.4.5",
+    "@adobe/generator-aio-app": "^6.0.0",
+    "@adobe/generator-app-common-lib": "^1.0.0",
     "@adobe/inquirer-table-checkbox": "^1.2.0",
     "@oclif/core": "^2.11.6",
     "@parcel/core": "^2.7.0",
@@ -48,12 +48,13 @@
     "term-size": "^2.2.1",
     "unzipper": "^0.10.11",
     "upath": "^2",
+    "junk": "^3.1.0",
     "which": "^3.0.0",
     "yeoman-environment": "^3.2.0"
   },
   "devDependencies": {
     "@adobe/aio-lib-test-proxy": "^1.0.0",
-    "@adobe/eslint-config-aio-lib-config": "^2.0.1",
+    "@adobe/eslint-config-aio-lib-config": "^2.0.2",
     "@types/jest": "^29",
     "babel-runtime": "^6.26.0",
     "core-js": "^3",

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

@@ -11,12 +11,9 @@ governing permissions and limitations under the License.
 
 const AddCommand = require('../../../AddCommand')
 const TemplatesCommand = require('../../../TemplatesCommand')
-const yeoman = require('yeoman-environment')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:event', { provider: 'debug' })
 const { Flags } = require('@oclif/core')
-const ora = require('ora')
 const path = require('path')
-const generators = require('@adobe/generator-aio-app')
 const TemplateRegistryAPI = require('@adobe/aio-lib-templates')
 
 class AddEventCommand extends TemplatesCommand {
@@ -24,7 +21,6 @@ class AddEventCommand extends TemplatesCommand {
     const { flags } = await this.parse(AddEventCommand)
 
     aioLogger.debug(`add events with flags: ${JSON.stringify(flags)}`)
-    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))
@@ -36,42 +32,27 @@ class AddEventCommand extends TemplatesCommand {
     const config = entries[0][1]
     const actionFolder = path.relative(config.root, config.actions.src)
     const runtimeManifestData = this.getRuntimeManifestConfigFile(configName)
-
+    const eventsData = this.getEventsConfigFile(configName)
     const templateOptions = {
       'skip-prompt': false,
       'action-folder': actionFolder,
       'config-path': runtimeManifestData.file,
-      'full-key-to-manifest': runtimeManifestData.key
+      'full-key-to-manifest': runtimeManifestData.key,
+      'full-key-to-events-manifest': eventsData.key,
+      'events-config-path': eventsData.file
     }
 
-    if (flags['experimental-allow-events-templates']) {
-      const eventsData = this.getEventsConfigFile(configName)
-      templateOptions['full-key-to-events-manifest'] = eventsData.key
-      templateOptions['events-config-path'] = eventsData.file
-      const [searchCriteria, orderByCriteria] = await this.getSearchCriteria()
-      const templates = await this.selectTemplates(searchCriteria, orderByCriteria)
-      if (templates.length === 0) {
-        this.error('No events templates were chosen to be installed.')
-      } else {
-        await this.installTemplates({
-          useDefaultValues: flags.yes,
-          installNpm: flags.install,
-          templateOptions,
-          templates
-        })
-      }
-      // by default yeoman runs the install, we control installation from the app plugin
+    const [searchCriteria, orderByCriteria] = await this.getSearchCriteria()
+    const templates = await this.selectTemplates(searchCriteria, orderByCriteria)
+    if (templates.length === 0) {
+      this.error('No events templates were chosen to be installed.')
     } else {
-      templateOptions['skip-prompt'] = flags.yes
-      templateOptions.force = true
-      const env = yeoman.createEnv()
-      env.options = { skipInstall: true }
-      const eventsGen = env.instantiate(generators['add-events'], {
-        options: templateOptions
+      await this.installTemplates({
+        useDefaultValues: flags.yes,
+        installNpm: flags.install,
+        templateOptions,
+        templates
       })
-      await env.runGenerator(eventsGen)
-
-      await this.runInstallPackages(flags, spinner)
     }
   }
 
@@ -107,10 +88,6 @@ AddEventCommand.flags = {
     multiple: false,
     parse: str => [str]
   }),
-  'experimental-allow-events-templates': Flags.boolean({
-    description: 'Feature flag to enable events templates. NOTE: skip-prompt will have no effect if this flag is enabled.',
-    default: false
-  }),
   ...AddCommand.flags
 }
 

package/src/commands/app/deploy.js

@@ -22,6 +22,9 @@ const { createWebExportFilter, runInProcess, buildExtensionPointPayloadWoMetadat
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
 
+const PRE_DEPLOY_EVENT_REG = 'pre-deploy-event-reg'
+const POST_DEPLOY_EVENT_REG = 'post-deploy-event-reg'
+
 class Deploy extends BuildCommand {
   async run () {
     // cli input
@@ -142,13 +145,10 @@ class Deploy extends BuildCommand {
 
     try {
       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, 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 })
-        }
+      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.error(err)
@@ -250,13 +250,10 @@ class Deploy extends BuildCommand {
 
     try {
       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, 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 })
-        }
+      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.error(err)
@@ -353,10 +350,9 @@ Deploy.flags = {
     exclusive: ['action', 'publish'] // no-publish is excluded
   }),
   'force-events': Flags.boolean({
-    description: '[default: false] Force event registrations and overwrite any previous registrations',
+    description: '[default: false] Force event registrations and delete any registrations not part of the config file',
     default: false,
     allowNo: true,
-    dependsOn: ['feature-event-hooks'],
     exclusive: ['action', 'publish'] // no-publish is excluded
   }),
   'web-optimize': Flags.boolean({
@@ -367,12 +363,6 @@ Deploy.flags = {
     description: '[default: true] Update log forwarding configuration on server',
     default: true,
     allowNo: true
-  }),
-  'feature-event-hooks': Flags.boolean({
-    description: '[default: false] Enable event hooks feature',
-    default: false,
-    allowNo: true,
-    hidden: true
   })
 }
 

package/src/commands/app/pack.js

@@ -21,14 +21,16 @@ const { loadConfigFile, writeFile } = require('../../lib/import-helper')
 const { getObjectValue } = require('../../lib/app-helper')
 const ora = require('ora')
 const chalk = require('chalk')
+const junk = require('junk')
 
 // eslint-disable-next-line node/no-missing-require
 const libConfigNext = require('@adobe/aio-cli-lib-app-config-next')
 
+const DIST_FOLDER = 'dist'
 const DEFAULTS = {
-  OUTPUT_ZIP_FILE: 'app.zip',
-  ARTIFACTS_FOLDER: 'app-package',
-  DEPLOY_YAML_FILE: 'deploy.yaml'
+  OUTPUT_ZIP_FILE_PATH: path.join(DIST_FOLDER, 'app.zip'),
+  ARTIFACTS_FOLDER_PATH: path.join(DIST_FOLDER, 'app-package'),
+  DEPLOY_YAML_FILE_NAME: 'deploy.yaml'
 }
 
 class Pack extends BaseCommand {
@@ -53,20 +55,37 @@ class Pack extends BaseCommand {
       aioLogger.debug(`changed current working directory to: ${resolvedPath}`)
     }
 
+    // get all 'dist' locations of all extensions (relative to the current working directory)
+    const distLocations = Object.entries(appConfig.all)
+      .map(([, extConfig]) => path.relative(process.cwd(), extConfig.app.dist))
+
     try {
       // 1. create artifacts phase
-      this.spinner.start(`Creating package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER}'...`)
-      await fs.emptyDir(DEFAULTS.ARTIFACTS_FOLDER)
-      this.spinner.succeed(`Created package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER}'`)
+      this.spinner.start(`Creating package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}'...`)
+      await fs.emptyDir(DEFAULTS.ARTIFACTS_FOLDER_PATH)
+      this.spinner.succeed(`Created package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}'`)
 
       // ACNA-2038
       // not artifacts folder should exist before we fire the event
-      await this.config.runHook('pre-pack', { appConfig, artifactsFolder: DEFAULTS.ARTIFACTS_FOLDER })
+
+      const hookResults = await this.config.runHook('pre-pack', { appConfig, artifactsFolder: DEFAULTS.ARTIFACTS_FOLDER_PATH })
+      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 })
+      }
+
+      // 1a. Get file list to pack
+      const fileList = await this.filesToPack({ filesToExclude: [flags.output, DEFAULTS.DIST_FOLDER, ...distLocations] })
+      this.log('=== Files to pack ===')
+      fileList.forEach((file) => {
+        this.log(`  ${file}`)
+      })
+      this.log('=====================')
 
       // 2. copy files to package phase
       this.spinner.start('Copying project files...')
-      const fileList = await this.filesToPack([flags.output])
-      await this.copyPackageFiles(DEFAULTS.ARTIFACTS_FOLDER, fileList)
+
+      await this.copyPackageFiles(DEFAULTS.ARTIFACTS_FOLDER_PATH, fileList)
       this.spinner.succeed('Copied project files')
 
       // 3. add/modify artifacts phase
@@ -79,13 +98,18 @@ class Pack extends BaseCommand {
       this.spinner.succeed('Added code-download annotations')
 
       // doing this before zip so other things can be added to the zip
-      await this.config.runHook('post-pack', { appConfig, artifactsFolder: DEFAULTS.ARTIFACTS_FOLDER })
+      await this.config.runHook('post-pack', { appConfig, artifactsFolder: DEFAULTS.ARTIFACTS_FOLDER_PATH })
 
       // 4. zip package phase
-      this.spinner.start(`Zipping package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER}' to '${outputZipFile}'...`)
+      this.spinner.start(`Zipping package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}' to '${outputZipFile}'...`)
       await fs.remove(outputZipFile)
-      await this.zipHelper(DEFAULTS.ARTIFACTS_FOLDER, outputZipFile)
-      this.spinner.succeed(`Zipped package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER}' to '${outputZipFile}'`)
+      await this.zipHelper(DEFAULTS.ARTIFACTS_FOLDER_PATH, outputZipFile)
+      this.spinner.succeed(`Zipped package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}' to '${outputZipFile}'`)
+
+      // 5. finally delete the artifacts folder
+      this.spinner.start(`Deleting package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}'...`)
+      await fs.remove(DEFAULTS.ARTIFACTS_FOLDER_PATH)
+      this.spinner.succeed(`Deleted package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}'`)
     } catch (e) {
       this.spinner.fail(e.message)
       this.error(flags.verbose ? e : e.message)
@@ -176,7 +200,7 @@ class Pack extends BaseCommand {
     }
 
     await writeFile(
-      path.join(DEFAULTS.ARTIFACTS_FOLDER, DEFAULTS.DEPLOY_YAML_FILE),
+      path.join(DEFAULTS.ARTIFACTS_FOLDER_PATH, DEFAULTS.DEPLOY_YAML_FILE_NAME),
       yaml.dump(deployJson),
       { overwrite: true })
   }
@@ -239,17 +263,38 @@ class Pack extends BaseCommand {
    *
    * This runs `npm pack` to get the list.
    *
-   * @param {Array<string>} filesToExclude a list of files to exclude
-   * @param {string} workingDirectory the working directory to run `npm pack` in
+   * @param {object} options the options for the method
+   * @param {Array<string>} options.filesToExclude a list of files to exclude
+   * @param {string} options.workingDirectory the working directory to run `npm pack` in
    * @returns {Array<string>} a list of files that are to be packed
    */
-  async filesToPack (filesToExclude = [], workingDirectory = process.cwd()) {
+  async filesToPack ({ filesToExclude = [], workingDirectory = process.cwd() } = {}) {
     const { stdout } = await execa('npm', ['pack', '--dry-run', '--json'], { cwd: workingDirectory })
 
+    const noJunkFiles = (file) => {
+      const isJunkFile = junk.is(file)
+      if (isJunkFile) {
+        aioLogger.debug(`junk file (omitted from pack): ${file}`)
+      }
+
+      return !isJunkFile
+    }
+
+    const noDotFiles = (file) => {
+      const isDotFile = /^\..*/.test(file)
+      if (isDotFile) {
+        aioLogger.debug(`hidden dotfile (omitted from pack): ${file}`)
+      }
+
+      return !isDotFile
+    }
+
     const { files } = JSON.parse(stdout)[0]
     return files
       .map(file => file.path)
       .filter(file => !filesToExclude.includes(file))
+      .filter(noJunkFiles) // no junk files like .DS_Store
+      .filter(noDotFiles) // no files that start with a '.'
   }
 
   /**
@@ -291,7 +336,7 @@ class Pack extends BaseCommand {
 
     // rewrite config files
     for (const [file, keys] of Object.entries(fileToAnnotationKey)) {
-      const configFilePath = path.join(DEFAULTS.ARTIFACTS_FOLDER, file)
+      const configFilePath = path.join(DEFAULTS.ARTIFACTS_FOLDER_PATH, file)
       const { values } = loadConfigFile(configFilePath)
 
       keys.forEach(key => {
@@ -321,7 +366,7 @@ Pack.flags = {
   output: Flags.string({
     description: 'The packaged app output file path',
     char: 'o',
-    default: DEFAULTS.OUTPUT_ZIP_FILE
+    default: DEFAULTS.OUTPUT_ZIP_FILE_PATH
   })
 }
 

package/src/commands/app/undeploy.js

@@ -78,13 +78,10 @@ class Undeploy extends BaseCommand {
     // undeploy
     try {
       await runInProcess(config.hooks['pre-app-undeploy'], config)
-      if (flags['feature-event-hooks'] && flags.events) {
-        this.log('feature-event-hooks is enabled, running pre-undeploy-event-reg hook')
-        const hookResults = await this.config.runHook('pre-undeploy-event-reg', { appConfig: config })
-        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 })
-        }
+      const hookResults = await this.config.runHook('pre-undeploy-event-reg', { appConfig: config })
+      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)
@@ -178,12 +175,6 @@ Undeploy.flags = {
     description: 'Force unpublish extension(s) from Exchange, will delete all extension points',
     default: false,
     exclusive: ['unpublish'] // unpublish is excluded
-  }),
-  'feature-event-hooks': Flags.boolean({
-    description: '[default: false] Enable event hooks feature',
-    default: false,
-    allowNo: true,
-    hidden: true
   })
 }
 

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

@@ -1,67 +0,0 @@
-/*
-Copyright 2020 Adobe. All rights reserved.
-This file is licensed to you under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License. You may obtain a copy
-of the License at http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed under
-the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
-OF ANY KIND, either express or implied. See the License for the specific language
-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, Args } = require('@oclif/core')
-const DeleteActionCommand = require('./action')
-const chalk = require('chalk')
-
-class DeleteEventCommand extends BaseCommand {
-  async run () {
-    const { args, flags } = await this.parse(DeleteEventCommand)
-
-    aioLogger.debug(`deleting events from the project, with args ${JSON.stringify(args)}, and flags: ${JSON.stringify(flags)}`)
-
-    // NOTE: this command only wraps app delete action, events will have more than actions later on
-    if (flags.yes && !args['event-action-name']) {
-      this.error('<event-action-name> must also be provided when using --yes')
-    }
-
-    if (!args['event-action-name']) {
-      this.log(chalk.bold(chalk.blue('NOTE: this is running the \'app delete action\' command, please select events actions.')))
-      this.log()
-    }
-
-    const cmdLineArgs = []
-    if (args['event-action-name']) {
-      cmdLineArgs.push(args['event-action-name'])
-    }
-    if (flags.yes) {
-      cmdLineArgs.push('--yes')
-    }
-    await DeleteActionCommand.run(cmdLineArgs)
-  }
-}
-
-DeleteEventCommand.description = `Delete existing Adobe I/O Events actions
-`
-
-DeleteEventCommand.flags = {
-  yes: Flags.boolean({
-    description: 'Skip questions, and use all default values',
-    char: 'y',
-    default: false
-  }),
-  ...BaseCommand.flags
-}
-
-DeleteEventCommand.args =
-  {
-    'event-action-name': Args.string({
-      description: 'Action `pkg/name` to delete, you can specify multiple actions via a comma separated list',
-      required: false
-    })
-  }
-
-DeleteEventCommand.aliases = ['app:delete:events']
-
-module.exports = DeleteEventCommand