Add a better error message when uploading without a zip

zapier · Mar 15, 2019 · 716b112 · 716b112
1 parent b688200
commit 716b112
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/commands/upload.js b/src/commands/upload.js
@@ -1,15 +1,20 @@
+const colors = require('colors/safe');
 const constants = require('../constants');
 const utils = require('../utils');
 
-const upload = context => {
-  context.line('Preparing to upload a new version.\n');
-  return utils.upload().then(() => {
+const upload = async context => {
+  try {
+    context.line('Preparing to upload a new version.\n');
+    await utils.upload();
+
     context.line(
       `\nUpload of ${constants.BUILD_PATH} and ${
         constants.SOURCE_PATH
       } complete! Try \`zapier versions\` now!`
     );
-  });
+  } catch (error) {
+    context.line(`${colors.red('Problem uploading:')} ${error.message}`);
+  }
 };
 upload.argsSpec = [];
 upload.argOptsSpec = {};

diff --git a/src/entry.js b/src/entry.js
@@ -123,7 +123,7 @@ module.exports = argv => {
     process.exit(1);
   }
 
-  commandFunc.apply(commands, [context].concat(args)).catch(err => {
+  commandFunc(context, ...args).catch(err => {
     utils.endSpinner(false);
 
     if (DEBUG || global.argOpts.debug) {

diff --git a/src/utils/api.js b/src/utils/api.js
@@ -270,6 +270,13 @@ const upload = (zipPath, sourceZipPath, appDir) => {
 
   const fullZipPath = path.resolve(appDir, zipPath);
   const fullSourceZipPath = path.resolve(appDir, sourceZipPath);
+  const isMissingZip = !fs.existsSync(fullZipPath);
+
+  if (isMissingZip) {
+    throw new Error(
+      'Missing a built app. Try running `zapier build` first.\nOr you could run `zapier push`, which will build and upload in one command.'
+    );
+  }
 
   return getLinkedApp(appDir)
     .then(app => {