zapier-platform-cli 17.9.0 → 17.9.1

package/oclif.manifest.json

@@ -2555,5 +2555,5 @@
       ]
     }
   },
-  "version": "17.9.0"
+  "version": "17.9.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-cli",
-  "version": "17.9.0",
+  "version": "17.9.1",
   "description": "The CLI for managing integrations in Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",

package/src/oclif/ZapierBaseCommand.js

@@ -8,6 +8,7 @@ const { recordAnalytics } = require('../utils/analytics');
 const { getWritableApp } = require('../utils/api');
 
 const inquirer = require('inquirer');
+const { throwForInvalidVersion } = require('../utils/version');
 
 const DATA_FORMATS = ['json', 'raw'];
 
@@ -90,16 +91,7 @@ class ZapierBaseCommand extends Command {
 
   // validate that user input looks like a semver version
   throwForInvalidVersion(version) {
-    if (
-      !version.match(
-        // this is mirrored in schemas/VersionSchema.js and developer_cli/constants.py
-        /^(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})(?:-(?=.{1,12}$)[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)?$/g,
-      )
-    ) {
-      throw new Error(
-        `${version} is an invalid version str. Try something like \`1.2.3\` or \`0.0.0-TICKET\``,
-      );
-    }
+    return throwForInvalidVersion(version);
   }
 
   async getWritableApp() {

package/src/oclif/commands/push.js

@@ -6,21 +6,18 @@ const colors = require('colors/safe');
 const BuildCommand = require('./build');
 
 const { buildAndOrUpload } = require('../../utils/build');
-const { localAppCommand } = require('../../utils/local');
-
 class PushCommand extends ZapierBaseCommand {
   async perform() {
     const skipNpmInstall = this.flags['skip-npm-install'];
-    const definition = await localAppCommand({ command: 'definition' });
 
     const snapshotLabel = this.flags.snapshot;
     if (snapshotLabel && snapshotLabel.length > 12) {
       throw new Error('Snapshot label cannot exceed 12 characters');
     }
-    const version = snapshotLabel
+
+    const snapshotVersion = snapshotLabel
       ? `0.0.0-${snapshotLabel}`
-      : definition.version;
-    this.throwForInvalidVersion(version);
+      : undefined;
 
     await buildAndOrUpload(
       { build: true, upload: true },
@@ -30,7 +27,7 @@ class PushCommand extends ZapierBaseCommand {
         skipValidation: this.flags['skip-validation'],
         overwritePartnerChanges: this.flags['overwrite-partner-changes'],
       },
-      version,
+      snapshotVersion,
     );
     this.log(
       `\nPush complete! Built ${BUILD_PATH} and ${SOURCE_PATH} and uploaded them to Zapier.`,

package/src/utils/api.js

@@ -428,7 +428,7 @@ const downloadSourceZip = async (dst) => {
 const upload = async (
   app,
   { skipValidation = false, overwritePartnerChanges = false } = {},
-  versionOverride,
+  snapshotVersion,
 ) => {
   const zipPath = constants.BUILD_PATH;
   const sourceZipPath = constants.SOURCE_PATH;
@@ -461,7 +461,7 @@ const upload = async (
     headers['X-Overwrite-Partner-Changes'] = 'true';
   }
 
-  const version = versionOverride ?? definition.version;
+  const version = snapshotVersion ?? definition.version;
   startSpinner(`Uploading version ${version}`);
   try {
     await callAPI(

package/src/utils/build.js

@@ -45,6 +45,7 @@ const checkMissingAppInfo = require('./check-missing-app-info');
 const { findCorePackageDir, isWindows, runCommand } = require('./misc');
 const { isBlocklisted, respectGitIgnore } = require('./ignore');
 const { localAppCommand } = require('./local');
+const { throwForInvalidVersion } = require('./version');
 
 const debug = require('debug')('zapier:build');
 
@@ -588,13 +589,16 @@ const testBuildZip = async (zipPath) => {
   }
 };
 
-const _buildFunc = async ({
-  skipNpmInstall = false,
-  disableDependencyDetection = false,
-  skipValidation = false,
-  printProgress = true,
-  checkOutdated = true,
-} = {}) => {
+const _buildFunc = async (
+  {
+    skipNpmInstall = false,
+    disableDependencyDetection = false,
+    skipValidation = false,
+    printProgress = true,
+    checkOutdated = true,
+  } = {},
+  snapshotVersion,
+) => {
   const maybeStartSpinner = printProgress ? startSpinner : () => {};
   const maybeEndSpinner = printProgress ? endSpinner : () => {};
 
@@ -659,6 +663,9 @@ const _buildFunc = async ({
     false,
   );
 
+  const version = snapshotVersion ?? rawDefinition.version;
+  throwForInvalidVersion(version);
+
   try {
     fs.writeFileSync(
       path.join(workingDir, 'definition.json'),
@@ -761,7 +768,7 @@ const _buildFunc = async ({
 const buildAndOrUpload = async (
   { build = false, upload = false } = {},
   buildOpts,
-  versionOverride,
+  snapshotVersion,
 ) => {
   if (!(build || upload)) {
     throw new Error('must either build or upload');
@@ -775,10 +782,10 @@ const buildAndOrUpload = async (
   }
 
   if (build) {
-    await _buildFunc(buildOpts);
+    await _buildFunc(buildOpts, snapshotVersion);
   }
   if (upload) {
-    await _uploadFunc(app, buildOpts, versionOverride);
+    await _uploadFunc(app, buildOpts, snapshotVersion);
   }
 };
 

package/src/utils/local.js

@@ -282,13 +282,21 @@ const getLocalAppHandler = async ({
     appRaw = loadAppRawUsingRequire(appDir);
   } catch (err) {
     if (err.code === 'MODULE_NOT_FOUND' || err.code === 'ERR_REQUIRE_ESM') {
-      appRaw = await loadAppRawUsingImport(
-        appDir,
-        corePackageDir,
-        shouldDeleteWrapper,
-      );
+      try {
+        appRaw = await loadAppRawUsingImport(
+          appDir,
+          corePackageDir,
+          shouldDeleteWrapper,
+        );
+      } catch (err) {
+        err.message =
+          'Your ESM integration requires a compiled `dist/` directory. Run `zapier build` to compile your code first.\n\n' +
+          err.message;
+        throw err;
+      }
     } else {
       // err.name === 'SyntaxError' or others
+
       throw err;
     }
   }

package/src/utils/version.js

@@ -0,0 +1,16 @@
+const throwForInvalidVersion = (version) => {
+  if (
+    !version.match(
+      // this is mirrored in schemas/VersionSchema.js and developer_cli/constants.py
+      /^(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})(?:-(?=.{1,12}$)[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)?$/g,
+    )
+  ) {
+    throw new Error(
+      `${version} is an invalid version str. Try something like \`1.2.3\` or \`0.0.0-TICKET\``,
+    );
+  }
+};
+
+module.exports = {
+  throwForInvalidVersion,
+};