@adobe/aio-cli-plugin-app 8.6.1 → 9.1.0

package/src/commands/app/undeploy.js

@@ -14,7 +14,7 @@ const ora = require('ora')
 const chalk = require('chalk')
 // const path = require('path')
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const webLib = require('@adobe/aio-lib-web')
@@ -24,7 +24,7 @@ const rtLib = require('@adobe/aio-lib-runtime')
 class Undeploy extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Undeploy)
+    const { flags } = await this.parse(Undeploy)
 
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags['skip-static'] && !flags['skip-web-assets'] && !flags.action
@@ -146,36 +146,36 @@ Undeploy.description = `Undeploys an Adobe I/O App
 
 Undeploy.flags = {
   ...BaseCommand.flags,
-  'skip-static': flags.boolean({
+  'skip-static': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-web-assets': flags.boolean({
+  'skip-web-assets': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions'
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Undeploy actions if any',
     default: true,
     allowNo: true
   }),
-  'web-assets': flags.boolean({
+  'web-assets': Flags.boolean({
     description: '[default: true] Undeploy web-assets if any',
     default: true,
     allowNo: true
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Undeploy only a specific extension, the flags can be specified multiple times',
     char: 'e',
     multiple: true
   }),
-  unpublish: flags.boolean({
+  unpublish: Flags.boolean({
     description: '[default: true] Unpublish selected extension(s) from Exchange',
     allowNo: true,
     default: true
   }),
-  'force-unpublish': flags.boolean({
+  'force-unpublish': Flags.boolean({
     description: 'Force unpublish extension(s) from Exchange, will delete all extension points',
     default: false,
     exclusive: ['unpublish'] // unpublish is excluded

package/src/commands/app/use.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../BaseCommand')
 const { CONSOLE_CONFIG_KEY, importConfigJson, loadAndValidateConfigFile } = require('../../lib/import')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const inquirer = require('inquirer')
 const config = require('@adobe/aio-lib-core-config')
 const { EOL } = require('os')
@@ -25,7 +25,7 @@ const chalk = require('chalk')
 
 class Use extends BaseCommand {
   async run () {
-    const { flags, args } = this.parse(Use)
+    const { flags, args } = await this.parse(Use)
 
     flags.workspace = flags.workspace || flags['workspace-name'] || ''
 
@@ -370,49 +370,49 @@ To download the configuration file for your project, select the 'Download' butto
 
 Use.flags = {
   ...BaseCommand.flags,
-  overwrite: flags.boolean({
+  overwrite: Flags.boolean({
     description: 'Overwrite any .aio and .env files during import of the Adobe Developer Console configuration file',
     default: false,
     exclusive: ['merge']
   }),
-  merge: flags.boolean({
+  merge: Flags.boolean({
     description: 'Merge any .aio and .env files during import of the Adobe Developer Console configuration file',
     default: false,
     exclusive: ['overwrite']
   }),
-  global: flags.boolean({
+  global: Flags.boolean({
     description: 'Use the global Adobe Developer Console Org / Project / Workspace configuration, which can be set via `aio console` commands',
     default: false,
     char: 'g',
     exclusive: ['workspace']
   }),
-  workspace: flags.string({
+  workspace: Flags.string({
     description: 'Specify the Adobe Developer Console Workspace name or Workspace id to import the configuration from',
     default: '',
     char: 'w',
     exclusive: ['global', 'workspace-name']
   }),
-  'confirm-new-workspace': flags.boolean({
+  'confirm-new-workspace': Flags.boolean({
     description: 'Skip and confirm prompt for creating a new workspace',
     default: false
   }),
-  'workspace-name': flags.string({
+  'workspace-name': Flags.string({
     description: '[DEPRECATED]: please use --workspace instead',
     default: '',
     char: 'w',
     exclusive: ['global', 'workspace']
   }),
-  'no-service-sync': flags.boolean({
+  'no-service-sync': Flags.boolean({
     description: 'Skip the Service sync prompt and do not attach current Service subscriptions to the new Workspace',
     default: false,
     exclusive: ['confirm-service-sync']
   }),
-  'confirm-service-sync': flags.boolean({
+  'confirm-service-sync': Flags.boolean({
     description: 'Skip the Service sync prompt and overwrite Service subscriptions in the new Workspace with current subscriptions',
     default: false,
     exclusive: ['no-service-sync']
   }),
-  'no-input': flags.boolean({
+  'no-input': Flags.boolean({
     description: 'Skip user prompts by setting --no-service-sync and --merge. Requires one of config_file_path or --global or --workspace',
     default: false
   })

package/src/lib/app-helper.js

@@ -486,12 +486,12 @@ function atLeastOne (input) {
 
 /** @private */
 function deleteUserConfig (configData) {
-  const phyConfig = yaml.safeLoad(fs.readFileSync(configData.file))
+  const phyConfig = yaml.load(fs.readFileSync(configData.file))
   const interKeys = configData.key.split('.')
   const phyActionConfigParent = interKeys.slice(0, -1).reduce((obj, k) => obj && obj[k], phyConfig)
   // like delete configFile.runtimeManifest.packages.actions.theaction
   delete phyActionConfigParent[interKeys.slice(-1)]
-  fs.writeFileSync(configData.file, yaml.safeDump(phyConfig))
+  fs.writeFileSync(configData.file, yaml.dump(phyConfig))
 }
 
 /** @private */

package/src/lib/build-actions.js

@@ -18,12 +18,13 @@ const { buildActions } = require('@adobe/aio-lib-runtime')
  *
  * @param {object} config see src/lib/config-loader.js
  * @param {Array<string>} filterActions add filters to deploy only specified OpenWhisk actions
+ * @param {boolean} [forceBuild=false] force a build (skip file changed hash check)
  */
-module.exports = async (config, filterActions) => {
+module.exports = async (config, filterActions, forceBuild = false) => {
   utils.runScript(config.hooks['pre-app-build'])
   const script = await utils.runScript(config.hooks['build-actions'])
   if (!script) {
-    await buildActions(config, filterActions)
+    await buildActions(config, filterActions, forceBuild)
   }
   utils.runScript(config.hooks['post-app-build'])
 }

package/src/lib/import.js

@@ -75,7 +75,7 @@ function loadConfigFile (fileOrBuffer) {
       }
     } else {
       try {
-        return { values: yaml.safeLoad(contents, { json: true }), format: 'yaml' }
+        return { values: yaml.load(contents, { json: true }), format: 'yaml' }
       } catch (e) {
         throw new Error('Cannot parse yaml')
       }
@@ -537,11 +537,8 @@ function transformCredentials (credentials, imsOrgId) {
   }
 
   return credentials.reduce((acc, credential) => {
-    // the json schema enforces either jwt OR oauth2 keys in a credential
-    let value = credential.oauth2
-    if (!value) {
-      value = credential.jwt
-    }
+    // the json schema enforces for jwt OR oauth2 OR apiKey in a credential
+    const value = credential.oauth2 || credential.jwt || credential.api_key
 
     const name = credential.name.replace(/ /gi, '_') // replace any spaces with underscores
     acc[name] = value

package/src/lib/run-dev.js

@@ -46,7 +46,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
   // control variables
   const hasFrontend = config.app.hasFrontend
   const withBackend = config.app.hasBackend && !skipActions
-  const isLocal = !options.devRemote // applies only for backend
+  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) {
@@ -80,7 +80,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
 
       // build and deploy actions
       log('building actions..')
-      await buildActions(devConfig)
+      await buildActions(devConfig, null, true /* force build */)
 
       const { cleanup: watcherCleanup } = await actionsWatcher({ config: devConfig, isLocal, log })
       cleanup.add(() => watcherCleanup(), 'stopping action watcher...')
@@ -101,7 +101,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
       if (!options.skipServe) {
         const script = await utils.runScript(config.hooks['build-static'])
         if (!script) {
-          const entryFile = config.web.src + '/index.html'
+          const entries = config.web.src + '/**/*.html'
           bundleOptions.serveOptions = {
             port: uiPort,
             https: bundleOptions.https
@@ -113,7 +113,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
           bundleOptions.additionalReporters = [
             { packageName: '@parcel/reporter-cli', resolveFrom: __filename }
           ]
-          defaultBundler = await bundle(entryFile, config.web.distDev, bundleOptions, log)
+          defaultBundler = await bundle(entries, config.web.distDev, bundleOptions, log)
         }
       }
     }

package/src/lib/vscode.js

@@ -42,14 +42,14 @@ function update (config) {
     }
 
     const env = yeoman.createEnv()
+    // by default yeoman runs the install, we control installation from the app plugin
+    env.options = { skipInstall: true }
     const gen = env.instantiate(generators['add-vscode-config'], {
       options: {
         'app-config': config,
         'env-file': config.envFile,
         'frontend-url': props.frontEndUrl,
-        'skip-prompt': true,
-        // by default yeoman runs the install, we control installation from the app plugin
-        'skip-install': true
+        'skip-prompt': true
       }
     })
     await env.runGenerator(gen)