@adobe/aio-cli-plugin-app 14.3.2 → 14.4.1

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

@@ -16,7 +16,8 @@ const { setRuntimeApiHostAndAuthHandler } = require('../../../../lib/auth-helper
 
 class LogForwardingCommand extends BaseCommand {
   async run () {
-    let aioConfig = (await this.getFullConfig()).aio
+    const { flags } = await this.parse(LogForwardingCommand)
+    let aioConfig = (await this.getFullConfig({}, flags)).aio
     aioConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
     const lf = await LogForwarding.init(aioConfig)
 
@@ -50,5 +51,8 @@ class LogForwardingCommand extends BaseCommand {
 
 LogForwardingCommand.description = 'Set log forwarding destination configuration'
 LogForwardingCommand.aliases = ['app:config:set:log-forwarding', 'app:config:set:lf']
+LogForwardingCommand.flags = {
+  ...BaseCommand.flags
+}
 
 module.exports = LogForwardingCommand

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 = await this.getFullConfig()
-    const { actions, actionsByImpl } = await this.getAllActions(fullConfig)
+    const fullConfig = await this.getFullConfig({}, flags)
+    const { actions, actionsByImpl } = await this.getAllActions(fullConfig, flags)
     if (actions.length <= 0) {
       this.error('There are no actions in this project!')
     }
@@ -108,7 +108,7 @@ class DeleteActionCommand extends BaseCommand {
     )))
   }
 
-  async getAllActions (config) {
+  async getAllActions (config, flags = {}) {
     const actions = []
     const actionsByImpl = {}
     const allConfigEntries = Object.entries(config.all)
@@ -121,7 +121,7 @@ class DeleteActionCommand extends BaseCommand {
           for (const [actionName, action] of actionEntries) {
             const fullActionName = `${pkgName}/${actionName}`
             const startKey = implName === 'application' ? 'application' : `extensions.${implName}`
-            const configData = await this.getConfigFileForKey(`${startKey}.runtimeManifest.packages.${pkgName}.actions.${actionName}`)
+            const configData = await this.getConfigFileForKey(`${startKey}.runtimeManifest.packages.${pkgName}.actions.${actionName}`, flags)
             const actionObj = {
               // assumes path is not relative
               path: action.function,
@@ -157,13 +157,13 @@ DeleteActionCommand.flags = {
 }
 
 DeleteActionCommand.args =
-  {
-    'action-name': Args.string({
-      description: 'Action `pkg/name` to delete, you can specify multiple actions via a comma separated list',
-      default: '',
-      required: false
-    })
-  }
+{
+  'action-name': Args.string({
+    description: 'Action `pkg/name` to delete, you can specify multiple actions via a comma separated list',
+    default: '',
+    required: false
+  })
+}
 
 DeleteActionCommand.aliases = ['app:delete:actions']
 

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 = await this.getFullConfig({ allowNoImpl: true })
+    const fullConfig = await this.getFullConfig({ allowNoImpl: true }, flags)
     const configs = await this.selectOrGetConfigsToDelete(flags, fullConfig)
 
     const resConfirm = await this.prompt([
@@ -44,7 +44,7 @@ class DeleteExtensionCommand extends BaseCommand {
       this.error('aborting..')
     }
 
-    await this.deleteImplementations(configs)
+    await this.deleteImplementations(configs, flags)
 
     this.log(chalk.bold(chalk.green(
       `✔ Successfully deleted implementation(s) '${Object.keys(configs)}'` + EOL +
@@ -71,7 +71,7 @@ class DeleteExtensionCommand extends BaseCommand {
     return await this.getAppExtConfigs(flags)
   }
 
-  async deleteImplementations (configs) {
+  async deleteImplementations (configs, flags) {
     for (const [id, c] of Object.entries(configs)) {
       // delete actions
       if (c.app.hasBackend) {
@@ -89,12 +89,12 @@ 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 = await this.getConfigFileForKey(configKey + '.operations')
+      const configDataOp = await this.getConfigFileForKey(configKey + '.operations', flags)
       if (configDataOp.file) {
         fs.removeSync(configDataOp.file)
       }
       // delete config in parent config file
-      const configData = await this.getConfigFileForKey(configKey)
+      const configData = await this.getConfigFileForKey(configKey, flags)
       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 = await this.getFullConfig()
+    const fullConfig = await this.getFullConfig({}, flags)
     const webAssetsByImpl = this.getAllWebAssets(fullConfig)
     if (!webAssetsByImpl) {
       this.error('web-assets not found')

package/src/commands/app/deploy.js

@@ -57,7 +57,7 @@ class Deploy extends BuildCommand {
     const spinner = ora()
 
     try {
-      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig()
+      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig({}, flags)
       const cliDetails = await getAccessToken({ useCachedToken: !flags.publish })
       const appInfo = {
         name: packageJson.name,

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

@@ -30,7 +30,7 @@ class GetUrlCommand extends BaseCommand {
       options.cdn = flags.cdn
 
       const urls = {}
-      const fullConfig = await this.getFullConfig()
+      const fullConfig = await this.getFullConfig({}, flags)
       if (options.action) {
         let action
         // search for action
@@ -107,9 +107,9 @@ GetUrlCommand.flags = {
 }
 
 GetUrlCommand.args =
-  {
-    action: Args.string({
-    })
-  }
+{
+  action: Args.string({
+  })
+}
 
 module.exports = GetUrlCommand

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(await this.getFullConfig({ allowNoImpl: true }))
+    const appConfig = deepCopy(await this.getFullConfig({ allowNoImpl: true }, flags))
 
     // includes .env secret delete all aio config for now
     delete appConfig.aio

package/src/commands/app/logs.js

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

package/src/commands/app/pack.js

@@ -57,6 +57,11 @@ class Pack extends BaseCommand {
       .map(([, extConfig]) => path.relative(process.cwd(), extConfig.app.dist))
 
     try {
+      // 0. validate package.json and package-lock.json compatibility (skip if --no-lock-file)
+      if (flags['lock-file']) {
+        await this.validatePackageLockCompatibility()
+      }
+
       // 1. create artifacts phase
       this.spinner.start(`Creating package artifacts folder '${DEFAULTS.ARTIFACTS_FOLDER_PATH}'...`)
       await fs.emptyDir(DEFAULTS.ARTIFACTS_FOLDER_PATH)
@@ -127,6 +132,26 @@ class Pack extends BaseCommand {
     return this._spinner
   }
 
+  /**
+   * Validates that package.json and package-lock.json are compatible
+   */
+  async validatePackageLockCompatibility () {
+    const packageLockPath = path.join(process.cwd(), 'package-lock.json')
+    if (!(await fs.pathExists(packageLockPath))) {
+      return
+    }
+
+    this.spinner.start('Validating package.json and package-lock.json compatibility...')
+    try {
+      await execa('npm', ['ci', '--dry-run'], { cwd: process.cwd() })
+      this.spinner.succeed('Validated package.json and package-lock.json compatibility')
+    } catch (error) {
+      this.spinner.fail('package.json and package-lock.json are incompatible')
+      const errorMessage = error.stderr || error.message || 'npm ci --dry-run failed'
+      throw new Error(`package.json and package-lock.json are incompatible. Run 'npm install' to update your package-lock.json.\n\nError: ${errorMessage}`)
+    }
+  }
+
   /**
    * Creates the deploy.yaml file
    *
@@ -371,7 +396,7 @@ Pack.description = `This command will support packaging apps for redistribution.
 Pack.flags = {
   ...BaseCommand.flags,
   'lock-file': Flags.boolean({
-    description: 'Include the package-lock.json file in the packaged app',
+    description: 'Include the package-lock.json file in the packaged app. When disabled, compatibility validation is skipped since the provisioner will use npm install instead of npm ci.',
     default: true,
     allowNo: true
   }),
@@ -383,11 +408,11 @@ Pack.flags = {
 }
 
 Pack.args =
-  {
-    path: Args.string({
-      description: 'Path to the app directory to package',
-      default: '.'
-    })
-  }
+{
+  path: Args.string({
+    description: 'Path to the app directory to package',
+    default: '.'
+  })
+}
 
 module.exports = Pack

package/src/commands/app/test.js

@@ -31,7 +31,7 @@ class Test extends BaseCommand {
       unit = true
     }
 
-    const buildConfigs = await this.getAppExtConfigs({ extension })
+    const buildConfigs = await this.getAppExtConfigs(flags, { extension })
     aioLogger.debug(`run buildConfigs:${JSON.stringify(buildConfigs, null, 2)}`)
 
     const totalResults = []
@@ -202,6 +202,7 @@ class Test extends BaseCommand {
 }
 
 Test.flags = {
+  ...BaseCommand.flags,
   extension: Flags.string({
     char: 'e',
     description: 'the extension(s) to test',

package/src/commands/app/undeploy.js

@@ -51,7 +51,7 @@ class Undeploy extends BaseCommand {
 
     const spinner = ora()
     try {
-      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig()
+      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig({}, flags)
       const cliDetails = await getAccessToken({ useCachedToken: !flags.unpublish })
       const appInfo = {
         name: packageJson.name,