zapier-platform-cli 18.0.5 → 18.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-cli",
-  "version": "18.0.5",
+  "version": "18.0.6",
   "description": "The CLI for managing integrations in Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",
@@ -53,7 +53,7 @@
     "semver": "7.7.2",
     "string-length": "4.0.2",
     "through2": "4.0.2",
-    "tmp": "0.2.4",
+    "tmp": "0.2.5",
     "traverse": "0.6.11",
     "update-notifier": "7.3.1",
     "yeoman-environment": "4.4.3",

package/src/oclif/commands/build.js

@@ -12,11 +12,11 @@ const colors = require('colors/safe');
 
 class BuildCommand extends BaseCommand {
   async perform() {
-    const skipNpmInstall = this.flags['skip-npm-install'];
+    const skipDepInstall = this.flags['skip-dep-install'];
     await buildAndOrUpload(
       { build: true },
       {
-        skipNpmInstall,
+        skipDepInstall,
         disableDependencyDetection: this.flags['disable-dependency-detection'],
         skipValidation: this.flags['skip-validation'],
       },
@@ -27,9 +27,9 @@ class BuildCommand extends BaseCommand {
         `Now you can upload them with the ${colors.bold.underline('zapier upload')} command.`,
     );
 
-    if (!skipNpmInstall) {
+    if (!skipDepInstall) {
       this.log(
-        `\nTip: Try ${colors.bold.underline('zapier build --skip-npm-install')} for faster builds.`,
+        `\nTip: Try ${colors.bold.underline('zapier build --skip-dep-install')} for faster builds.`,
       );
     }
   }
@@ -40,9 +40,10 @@ BuildCommand.flags = buildFlags({
     'disable-dependency-detection': Flags.boolean({
       description: `Disable "smart" file inclusion. By default, Zapier only includes files that are required by your entry point (\`index.js\` by default). If you (or your dependencies) require files dynamically (such as with \`require(someVar)\`), then you may see "Cannot find module" errors. Disabling this may make your \`build.zip\` too large. If that's the case, try using the \`includeInBuild\` option in your \`${CURRENT_APP_FILE}\`. See the docs about \`includeInBuild\` for more info.`,
     }),
-    'skip-npm-install': Flags.boolean({
+    'skip-dep-install': Flags.boolean({
+      aliases: ['skip-npm-install'],
       description:
-        'Skips installing a fresh copy of npm dependencies for shorter build time. Helpful for using yarn, pnpm, or local copies of dependencies.',
+        '[alias: --skip-npm-install]\nSkips installing a fresh copy of dependencies for shorter build time. Helpful for using yarn, pnpm, or local copies of dependencies.',
     }),
     'skip-validation': Flags.boolean({
       description:

package/src/oclif/commands/push.js

@@ -8,7 +8,7 @@ const BuildCommand = require('./build');
 const { buildAndOrUpload } = require('../../utils/build');
 class PushCommand extends ZapierBaseCommand {
   async perform() {
-    const skipNpmInstall = this.flags['skip-npm-install'];
+    const skipDepInstall = this.flags['skip-dep-install'];
 
     const snapshotLabel = this.flags.snapshot;
     if (snapshotLabel && snapshotLabel.length > 12) {
@@ -22,7 +22,7 @@ class PushCommand extends ZapierBaseCommand {
     await buildAndOrUpload(
       { build: true, upload: true },
       {
-        skipNpmInstall,
+        skipDepInstall,
         disableDependencyDetection: this.flags['disable-dependency-detection'],
         skipValidation: this.flags['skip-validation'],
         overwritePartnerChanges: this.flags['overwrite-partner-changes'],
@@ -33,9 +33,9 @@ class PushCommand extends ZapierBaseCommand {
       `\nPush complete! Built ${BUILD_PATH} and ${SOURCE_PATH} and uploaded them to Zapier.`,
     );
 
-    if (!skipNpmInstall) {
+    if (!skipDepInstall) {
       this.log(
-        `\nTip: Try ${colors.bold.underline('zapier push --skip-npm-install')} for faster builds.`,
+        `\nTip: Try ${colors.bold.underline('zapier push --skip-dep-install')} for faster builds.`,
       );
     }
   }

package/src/utils/build.js

@@ -46,6 +46,7 @@ const { findCorePackageDir, isWindows, runCommand } = require('./misc');
 const { isBlocklisted, respectGitIgnore } = require('./ignore');
 const { localAppCommand } = require('./local');
 const { throwForInvalidVersion } = require('./version');
+const { getPackageManager } = require('./package-manager');
 
 const debug = require('debug')('zapier:build');
 
@@ -592,7 +593,7 @@ const testBuildZip = async (zipPath) => {
 
 const _buildFunc = async (
   {
-    skipNpmInstall = false,
+    skipDepInstall = false,
     disableDependencyDetection = false,
     skipValidation = false,
     printProgress = true,
@@ -609,7 +610,7 @@ const _buildFunc = async (
   const appDir = process.cwd();
 
   let workingDir;
-  if (skipNpmInstall) {
+  if (skipDepInstall) {
     workingDir = appDir;
     debug('Building in app directory: ', workingDir);
   } else {
@@ -628,16 +629,25 @@ const _buildFunc = async (
   const buildDir = path.join(appDir, BUILD_DIR);
   await fse.ensureDir(buildDir);
 
-  if (!skipNpmInstall) {
+  if (!skipDepInstall) {
     maybeStartSpinner('Copying project to temp directory');
     const copyFilter = (src) => !src.endsWith('.zip');
     await copyDir(appDir, workingDir, { filter: copyFilter });
 
     maybeEndSpinner();
-    maybeStartSpinner('Installing project dependencies');
-    const output = await runCommand('npm', ['install', '--production'], {
-      cwd: workingDir,
-    });
+    const packageManager = await getPackageManager();
+
+    maybeStartSpinner(
+      `Installing project dependencies using ${packageManager.executable}`,
+    );
+
+    const output = await runCommand(
+      packageManager.executable,
+      ['install', '--production'],
+      {
+        cwd: workingDir,
+      },
+    );
 
     // `npm install` may fail silently without returning a non-zero exit code,
     // need to check further here
@@ -744,7 +754,7 @@ const _buildFunc = async (
 
   maybeEndSpinner();
 
-  if (skipNpmInstall) {
+  if (skipDepInstall) {
     maybeStartSpinner('Cleaning up temp files');
     await deleteZapierWrapper(workingDir);
     fs.rmSync(path.join(workingDir, 'definition.json'));

package/src/utils/misc.js

@@ -151,7 +151,7 @@ const isValidAppInstall = () => {
 };
 
 const npmInstall = (appDir) => {
-  return runCommand('npm', ['install'], { cwd: appDir });
+  return runCommand('npm', ['install', '--ignore-scripts'], { cwd: appDir });
 };
 
 /*

package/src/utils/package-manager.js

@@ -1,39 +1,56 @@
-const { pathExists } = require('fs-extra');
+const { pathExists, readFile } = require('fs-extra');
 const path = require('path');
 
-const packageManagers = [
-  {
+const packageManagers = {
+  npm: {
     lockFile: 'package-lock.json',
     forceFlag: undefined,
     executable: 'npm',
     useDoubleHyphenBeforeArgs: true,
   },
-  {
+  yarn: {
     lockFile: 'yarn.lock',
     forceFlag: 'yarn',
     executable: 'yarn',
     useDoubleHyphenBeforeArgs: false, // yarn gives a warning if we include `--`
   },
-  {
+  pnpm: {
     lockFile: 'pnpm-lock.yaml',
     forceFlag: 'pnpm',
     executable: 'pnpm',
     useDoubleHyphenBeforeArgs: true,
   },
-];
+  bun: {
+    lockFile: 'bun.lock',
+    forceFlag: 'bun',
+    executable: 'bun',
+    useDoubleHyphenBeforeArgs: false,
+  },
+};
+
+const defaultPackageManager = packageManagers.npm;
+
+const getPackageManager = async (flags = {}) => {
+  for (const config of Object.values(packageManagers)) {
+    if (config.forceFlag && flags[config.forceFlag]) {
+      return config;
+    }
+  }
 
-const defaultPackageManager = packageManagers[0];
+  const packageJsonPath = path.join(process.cwd(), 'package.json');
+  if (await pathExists(packageJsonPath)) {
+    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'));
 
-const getPackageManager = async (flags) => {
-  for (const man of packageManagers) {
-    if (flags[man.forceFlag]) {
-      return man;
+    for (const man of Object.keys(packageManagers)) {
+      if (packageJson.packageManager?.startsWith(man)) {
+        return packageManagers[man];
+      }
     }
   }
 
-  for (const man of packageManagers) {
-    if (await pathExists(path.join(process.cwd(), man.lockFile))) {
-      return man;
+  for (const config of Object.values(packageManagers)) {
+    if (await pathExists(path.join(process.cwd(), config.lockFile))) {
+      return config;
     }
   }