zapier-platform-cli 11.2.0 → 11.3.2

package/src/oclif/commands/test.js

@@ -1,5 +1,3 @@
-const path = require('path');
-const { pathExists } = require('fs-extra');
 const { flags } = require('@oclif/command');
 const chalk = require('chalk');
 
@@ -9,6 +7,7 @@ const constants = require('../../constants');
 const { buildFlags } = require('../buildFlags');
 const { readCredentials } = require('../../utils/api');
 const { runCommand } = require('../../utils/misc');
+const { getPackageManager } = require('../../utils/package-manager');
 
 class TestCommand extends BaseCommand {
   async perform() {
@@ -35,9 +34,7 @@ class TestCommand extends BaseCommand {
 
     const env = Object.assign({}, process.env, extraEnv);
 
-    const useYarn =
-      this.flags.yarn ||
-      (await pathExists(path.join(process.cwd(), 'yarn.lock')));
+    const packageManager = await getPackageManager(this.flags);
 
     const passthroughArgs = this.argv.includes('--')
       ? this.argv.slice(this.argv.indexOf('--') + 1)
@@ -47,21 +44,22 @@ class TestCommand extends BaseCommand {
       'run',
       '--silent',
       'test',
-      useYarn ? '' : '--', // yarn gives a warning if we include `--`
+      packageManager.useDoubleHyphenBeforeArgs ? '--' : '',
       ...passthroughArgs,
     ].filter(Boolean);
-    const packageManager = useYarn ? 'yarn' : 'npm';
 
     this.log('Running test suite with the following command:');
     // some extra formatting happen w/ quotes so it's clear when they're already like that in the array,
     // but the space-joined array made that unclear
     this.log(
-      `\n  ${chalk.cyanBright.bold(packageManager)} ${chalk.cyanBright(
+      `\n  ${chalk.cyanBright.bold(
+        packageManager.executable
+      )} ${chalk.cyanBright(
         argv.map((a) => (a.includes(' ') ? `"${a}"` : a)).join(' ')
       )}\n`
     );
 
-    const output = await runCommand(packageManager, argv, {
+    const output = await runCommand(packageManager.executable, argv, {
       stdio: 'inherit',
       env,
     });
@@ -81,6 +79,10 @@ TestCommand.flags = buildFlags({
       description:
         "Use `yarn` instead of `npm`. This happens automatically if there's a `yarn.lock` file, but you can manually force `yarn` if you run tests from a sub-directory.",
     }),
+    pnpm: flags.boolean({
+      description:
+        "Use `pnpm` instead of `npm`. This happens automatically if there's a `pnpm-lock.yaml` file, but you can manually force `pnpm` if you run tests from a sub-directory.",
+    }),
   },
 });
 

package/src/oclif/hooks/renderMarkdownHelp.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const marked = require('marked');
+const { marked } = require('marked');
 const TerminalRenderer = require('marked-terminal');
 const { stdtermwidth } = require('@oclif/plugin-help/lib/screen');
 

package/src/oclif/oCommands.js

@@ -15,6 +15,7 @@ module.exports = {
   'env:set': require('./commands/env/set'),
   'env:unset': require('./commands/env/unset'),
   history: require('./commands/history'),
+  jobs: require('./commands/jobs'),
   init: require('./commands/init'),
   integrations: require('./commands/integrations'),
   link: require('./commands/link'),

package/src/utils/api.js

@@ -327,6 +327,8 @@ const listLogs = (opts) => {
 const listEnv = (version) =>
   listEndpoint(`versions/${version}/environment`, 'env');
 
+const listMigrations = () => listEndpoint('migrations');
+
 // the goal of this is to call `/check` with as much info as possible
 // if the app is registered and auth is available, then we can send app id
 // otherwise, we should just send the definition and get back checks about that
@@ -411,6 +413,7 @@ module.exports = {
   listInvitees,
   listLogs,
   listVersions,
+  listMigrations,
   readCredentials,
   upload,
   validateApp,

package/src/utils/package-manager.js

@@ -0,0 +1,45 @@
+const { pathExists } = require('fs-extra');
+const path = require('path');
+
+const packageManagers = [
+  {
+    lockFile: 'package-lock.json',
+    forceFlag: undefined,
+    executable: 'npm',
+    useDoubleHyphenBeforeArgs: true,
+  },
+  {
+    lockFile: 'yarn.lock',
+    forceFlag: 'yarn',
+    executable: 'yarn',
+    useDoubleHyphenBeforeArgs: false, // yarn gives a warning if we include `--`
+  },
+  {
+    lockFile: 'pnpm-lock.yaml',
+    forceFlag: 'pnpm',
+    executable: 'pnpm',
+    useDoubleHyphenBeforeArgs: true,
+  },
+];
+
+const defaultPackageManager = packageManagers[0];
+
+const getPackageManager = async (flags) => {
+  for (const man of packageManagers) {
+    if (flags[man.forceFlag]) {
+      return man;
+    }
+  }
+
+  for (const man of packageManagers) {
+    if (await pathExists(path.join(process.cwd(), man.lockFile))) {
+      return man;
+    }
+  }
+
+  return defaultPackageManager;
+};
+
+module.exports = {
+  getPackageManager,
+};