@adobe/aio-cli-lib-app-config 1.0.1 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aio-cli-lib-app-config",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "node lib to provide a consistent interface to various config files that make up Adobe Developer App Builder applications and extensions",
   "repository": "https://github.com/adobe/aio-cli-lib-app-config/",
   "license": "Apache-2.0",
@@ -31,11 +31,11 @@
     "eslint": "^8",
     "eslint-config-standard": "^17",
     "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^23",
-    "eslint-plugin-jsdoc": "^37",
+    "eslint-plugin-jest": "^27",
+    "eslint-plugin-jsdoc": "^42",
+    "eslint-plugin-n": "^16",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6",
-    "eslint-plugin-n": "^15",
     "eslint-plugin-standard": "^4.0.0",
     "jest": "^27",
     "jest-junit": "^10.0.0",

package/src/index.js

@@ -34,6 +34,24 @@ const defaults = {
   EXTENSIONS_CONFIG_KEY: 'extensions'
 }
 
+const HookKeys = [
+  'pre-app-build',
+  'post-app-build',
+  'build-actions',
+  'build-static',
+  'pre-app-deploy',
+  'post-app-deploy',
+  'deploy-actions',
+  'deploy-static',
+  'pre-app-undeploy',
+  'post-app-undeploy',
+  'undeploy-actions',
+  'undeploy-static',
+  'pre-app-run',
+  'post-app-run',
+  'serve-static'
+]
+
 const {
   getCliEnv, /* function */
   STAGE_ENV /* string */
@@ -158,7 +176,7 @@ function loadCommonConfig () {
     ow: owConfig,
     aio: aioConfig,
     // soon not needed anymore (for old headless validator)
-    imsOrgId: aioConfig && aioConfig.project && aioConfig.project.org && aioConfig.project.org.ims_org_id
+    imsOrgId: aioConfig.project?.org?.ims_org_id
   }
 }
 
@@ -289,7 +307,9 @@ function loadUserConfigLegacy (commonConfig) {
   // todo: new value usingLegacyConfig
   // this module should not console.log/warn ... or include chalk ...
   if (commonConfig.aio.cna !== undefined || commonConfig.aio.app !== undefined) {
-    aioLogger.warn('App config in \'.aio\' file is deprecated. Please move your \'.aio.app\' or \'.aio.cna\' to \'app.config.yaml\'.')
+    // this might have never have been seen in the wild as we don't know
+    // what log-level users have set
+    aioLogger.error('App config in \'.aio\' file is deprecated. Please move your \'.aio.app\' or \'.aio.cna\' to \'app.config.yaml\'.')
     const appConfig = { ...commonConfig.aio.app, ...commonConfig.aio.cna }
     Object.entries(appConfig).forEach(([k, v]) => {
       legacyAppConfig[k] = v
@@ -321,30 +341,17 @@ function loadUserConfigLegacy (commonConfig) {
   if (pkgjsonscripts) {
     const hooks = {}
     // https://www.adobe.io/apis/experienceplatform/project-firefly/docs.html#!AdobeDocs/project-firefly/master/guides/app-hooks.md
-    hooks['pre-app-build'] = pkgjsonscripts['pre-app-build']
-    hooks['post-app-build'] = pkgjsonscripts['post-app-build']
-    hooks['build-actions'] = pkgjsonscripts['build-actions']
-    hooks['build-static'] = pkgjsonscripts['build-static']
-    hooks['pre-app-deploy'] = pkgjsonscripts['pre-app-deploy']
-    hooks['post-app-deploy'] = pkgjsonscripts['post-app-deploy']
-    hooks['deploy-actions'] = pkgjsonscripts['deploy-actions']
-    hooks['deploy-static'] = pkgjsonscripts['deploy-static']
-    hooks['pre-app-undeploy'] = pkgjsonscripts['pre-app-undeploy']
-    hooks['post-app-undeploy'] = pkgjsonscripts['post-app-undeploy']
-    hooks['undeploy-actions'] = pkgjsonscripts['undeploy-actions']
-    hooks['undeploy-static'] = pkgjsonscripts['undeploy-static']
-    hooks['pre-app-run'] = pkgjsonscripts['pre-app-run']
-    hooks['post-app-run'] = pkgjsonscripts['post-app-run']
-    hooks['serve-static'] = pkgjsonscripts['serve-static']
-    // remove undefined hooks
-    Object.entries(hooks).forEach(([k, v]) => {
-      if (!hooks[k]) {
-        delete hooks[k]
+
+    HookKeys.forEach(hookKey => {
+      if (pkgjsonscripts[hookKey]) {
+        hooks[hookKey] = pkgjsonscripts[hookKey]
+        includeIndex[`${defaults.APPLICATION_CONFIG_KEY}.hooks.${hookKey}`] = { file: 'package.json', key: `scripts.${hookKey}` }
       }
     })
+
     // todo: new val usingLegacyHooks:Boolean
     if (Object.keys(hooks).length > 0) {
-      aioLogger.warn('hooks in \'package.json\' are deprecated. Please move your hooks to \'app.config.yaml\' under the \'hooks\' key')
+      aioLogger.error('hooks in \'package.json\' are deprecated. Please move your hooks to \'app.config.yaml\' under the \'hooks\' key')
       legacyAppConfig.hooks = hooks
       // build index
       includeIndex[`${defaults.APPLICATION_CONFIG_KEY}.hooks`] = { file: 'package.json', key: 'scripts' }
@@ -421,7 +428,10 @@ function buildExtConfigs (userConfig, commonConfig, includeIndex) {
 
 /** @private */
 function buildAppConfig (userConfig, commonConfig, includeIndex) {
-  const fullAppConfig = buildSingleConfig(defaults.APPLICATION_CONFIG_KEY, userConfig[defaults.APPLICATION_CONFIG_KEY], commonConfig, includeIndex)
+  const fullAppConfig = buildSingleConfig(defaults.APPLICATION_CONFIG_KEY,
+    userConfig[defaults.APPLICATION_CONFIG_KEY],
+    commonConfig,
+    includeIndex)
 
   if (!fullAppConfig.app.hasBackend && !fullAppConfig.app.hasFrontend) {
     // only set application config if there is an actuall app, meaning either some backend or frontend
@@ -488,6 +498,13 @@ function buildSingleConfig (configName, singleUserConfig, commonConfig, includeI
   config.app.hasFrontend = fs.existsSync(web)
   config.app.dist = path.resolve(dist, dist === defaultDistPath ? subFolderName : '')
 
+  if (singleUserConfig.events) {
+    config.events = { ...singleUserConfig.events }
+  }
+  if (commonConfig?.aio?.project) {
+    config.project = commonConfig.aio.project
+  }
+
   // actions
   config.actions.src = path.resolve(actions) // needed for app add first action
   if (config.app.hasBackend) {