@adobe/aio-cli-plugin-app 8.5.1 → 8.6.1-pre.2022-08-17.163d3a3a

package/src/commands/app/test.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 const { runScript } = require('../../lib/app-helper')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 const chalk = require('chalk')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:test', { provider: 'debug' })
@@ -19,7 +19,7 @@ const path = require('path')
 
 class Test extends BaseCommand {
   async run () {
-    const { flags } = this.parse(Test)
+    const { flags } = await this.parse(Test)
     let { all, unit, e2e, action, extension } = flags
 
     // 'all' overrides the setting of either the unit or e2e flag
@@ -201,27 +201,27 @@ class Test extends BaseCommand {
 }
 
 Test.flags = {
-  extension: flags.string({
+  extension: Flags.string({
     char: 'e',
     description: 'the extension(s) to test',
     exclusive: ['action'],
     multiple: true
   }),
-  action: flags.string({
+  action: Flags.string({
     char: 'a',
     description: 'the action(s) to test',
     exclusive: ['extension'],
     multiple: true
   }),
-  all: flags.boolean({
+  all: Flags.boolean({
     description: 'run both unit and e2e tests',
     default: false
   }),
-  e2e: flags.boolean({
+  e2e: Flags.boolean({
     description: 'run e2e tests',
     default: false
   }),
-  unit: flags.boolean({
+  unit: Flags.boolean({
     description: 'run unit tests',
     default: false
   })

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/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/deploy-actions.js

@@ -17,17 +17,17 @@ const { deployActions } = require('@adobe/aio-lib-runtime')
  * Deploys actions.
  *
  * @param {object} config see src/lib/config-loader.js
- * @param {boolean} isLocal default false, set to true if it's a local deploy
+ * @param {boolean} isLocalDev default false, set to true if it's a local deploy
  * @param {Function} [log] a log function
  * @param {boolean} filter true if a filter by built actions is desired.
  */
 /** @private */
-module.exports = async (config, isLocal = false, log = () => {}, filter = false) => {
+module.exports = async (config, isLocalDev = false, log = () => {}, filter = false) => {
   utils.runScript(config.hooks['pre-app-deploy'])
   const script = await utils.runScript(config.hooks['deploy-actions'])
   if (!script) {
     const deployConfig = {
-      isLocalDev: isLocal,
+      isLocalDev,
       filterEntities: {
         byBuiltActions: filter
       }

package/src/lib/run-dev.js

@@ -19,7 +19,7 @@ const bundleServe = require('./bundle-serve')
 const { defaultHttpServerPort: SERVER_DEFAULT_PORT } = require('./defaults')
 const serve = require('./serve')
 const Cleanup = require('./cleanup')
-const runLocalRuntime = require('./run-local-runtime')
+const { runLocalRuntime } = require('./run-local-runtime')
 
 const buildActions = require('./build-actions')
 const deployActions = require('./deploy-actions')
@@ -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,9 +80,8 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
 
       // build and deploy actions
       log('building actions..')
-      await buildActions(devConfig)
+      await buildActions(devConfig, null, true /* force build */)
 
-      log(`watching action files at ${devConfig.actions.src}...`)
       const { cleanup: watcherCleanup } = await actionsWatcher({ config: devConfig, isLocal, log })
       cleanup.add(() => watcherCleanup(), 'stopping action watcher...')
     }
@@ -95,14 +94,14 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
         // note the condition: we still write backend urls EVEN if skipActions is set
         // the urls will always point to remotely deployed actions if skipActions is set
         log('injecting backend urls into frontend config')
-        urls = rtLibUtils.getActionUrls(devConfig, true, isLocal && !skipActions)
+        urls = rtLibUtils.getActionUrls(devConfig, true, isLocal && !skipActions, true)
       }
       utils.writeConfig(devConfig.web.injectedConfig, urls)
 
       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
@@ -114,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/run-local-runtime.js

@@ -32,6 +32,12 @@ const OW_WAIT_INIT_TIME = 2000
 const OW_WAIT_PERIOD_TIME = 500
 const OW_TIMEOUT = 60000
 
+const LOCAL_RUNTIME = {
+  namespace: OW_LOCAL_NAMESPACE,
+  auth: OW_LOCAL_AUTH,
+  apihost: OW_LOCAL_APIHOST
+}
+
 /**
  * @typedef {object} RunDevLocalObject
  * @property {string} config the modified dev config
@@ -55,9 +61,8 @@ const OW_TIMEOUT = 60000
  * @returns {RunDevLocalObject} the RunDevLocalObject
  */
 async function runDevLocal (config, dataDir, log = () => undefined, verbose = false) {
-  const devConfig = cloneDeep(config)
-  devConfig.envFile = path.join(config.app.dist, '.env.local')
   const owJarFile = path.join(dataDir, OW_JAR_PATH)
+  const devConfig = loadLocalDevConfig(config)
 
   // take following steps only when we have a backend
   log('checking if java is installed...')
@@ -91,16 +96,8 @@ async function runDevLocal (config, dataDir, log = () => undefined, verbose = fa
   }
   const res = await utils.runOpenWhiskJar(owJarFile, OW_CONFIG_RUNTIMES_FILE, OW_LOCAL_APIHOST, OW_WAIT_INIT_TIME, OW_WAIT_PERIOD_TIME, OW_TIMEOUT, owExecaOptions)
 
-  log('setting local openwhisk credentials...')
-  const runtime = {
-    namespace: OW_LOCAL_NAMESPACE,
-    auth: OW_LOCAL_AUTH,
-    apihost: OW_LOCAL_APIHOST
-  }
-  devConfig.ow = { ...devConfig.ow, ...runtime }
-
   log(`writing credentials to tmp wskdebug config '${devConfig.envFile}'`)
-  await writeLocalEnvFile(devConfig, runtime)
+  await writeLocalEnvFile(devConfig, LOCAL_RUNTIME)
 
   const cleanup = () => {
     aioLogger.debug('stopping local OpenWhisk stack...')
@@ -118,6 +115,19 @@ async function runDevLocal (config, dataDir, log = () => undefined, verbose = fa
   }
 }
 
+/**
+ * @param {object} config the app config
+ * @param {Function} [log] function to log application logs
+ * @returns {RunDevLocalObject} the RunDevLocalObject
+ */
+function loadLocalDevConfig (config, log) {
+  const devConfig = cloneDeep(config)
+  devConfig.envFile = path.join(config.app.dist, '.env.local')
+  log && log('setting local openwhisk credentials...')
+  devConfig.ow = { ...devConfig.ow, ...LOCAL_RUNTIME }
+  return devConfig
+}
+
 /**
  * Writes the local debugging .env file
  *
@@ -141,4 +151,4 @@ async function writeLocalEnvFile (appConfig, runtimeCredentials) {
   `))
 }
 
-module.exports = runDevLocal
+module.exports = { runLocalRuntime: runDevLocal, loadLocalDevConfig }

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)