validate theme_id on deploy tasks (#50)

src/gulpfile.js

@@ -50,7 +50,7 @@ gulp.task('zip', (done) => {
  * @static
  */
 gulp.task('watch', () => {
-  runSequence('build:config', defineWatchTasks());
+  runSequence('validate:id', 'build:config', defineWatchTasks());
 });
 
 function defineWatchTasks() {
@@ -77,7 +77,7 @@ function defineWatchTasks() {
  * @static
  */
 gulp.task('deploy', (done) => {
-  runSequence('build', 'deploy:replace', done);
+  runSequence('validate:id', 'build', 'deploy:replace', done);
 });
 
 /**

src/tasks/deploy-sync.js

@@ -30,9 +30,9 @@ gulp.task('deploy:sync-init', () => {
   const envObj = tkConfig[environment];
   let proxyTarget = `https://${envObj.store}`;
 
-  if (envObj.theme_id && (envObj.theme_id === parseInt(envObj.theme_id, 10))) {
-    proxyTarget += `?preview_theme_id=${envObj.theme_id}`;
-  }
+  // break theme preview cache by always setting a preview parameter
+  const previewParam = (envObj.theme_id !== 'live') ? envObj.theme_id : '';
+  proxyTarget += `?preview_theme_id=${previewParam}`;
 
   debug(proxyTarget);
 

src/tasks/deploy-utils.js

@@ -37,6 +37,67 @@ function deploy(env) {
   });
 }
 
+/**
+ * Validate theme_id used for the environment
+ * @param {Object} - settings of theme_id and environment
+ * @returns {Promise}
+ * @private
+ */
+function validateId(settings) {
+  return new Promise((resolve, reject) => {
+    // Only string allowed is "live"
+    if (settings.themeId === 'live') {
+      resolve();
+    }
+
+    const id = Number(settings.themeId);
+
+    if (isNaN(id)) {
+      reject(settings);
+    } else {
+      resolve();
+    }
+  });
+}
+
+/**
+ * Validate the config.yml theme_id is an integer or "live"
+ * @function validate:id
+ * @memberof slate-cli.tasks.watch, slate-cli.tasks.deploy
+ * @private
+ */
+
+gulp.task('validate:id', () => {
+  const file = fs.readFileSync(config.tkConfig, 'utf8');
+  const tkConfig = yaml.safeLoad(file);
+  let envObj;
+
+  const environments = config.environment.split(/\s*,\s*|\s+/);
+  const promises = [];
+
+  environments.forEach((environment) => {
+    function factory() {
+      envObj = tkConfig[environment];
+      const envSettings = {
+        themeId: envObj.theme_id,
+        environment,
+      };
+
+      return validateId(envSettings);
+    }
+    promises.push(factory);
+  });
+
+  return utils.promiseSeries(promises)
+    .catch((result) => {
+      // stop process to prevent deploy defaulting to published theme
+      messages.invalidThemeId(result.themeId, result.environment);
+      const exitCode = 2;
+      return process.exit(exitCode);
+    });
+
+});
+
 /**
  * Replace your existing theme using ThemeKit.
  *

src/tasks/includes/messages.js

@@ -73,6 +73,13 @@ const messages = {
       ' and run a full <slate deploy> as a result.';
   },
 
+  invalidThemeId: (themeId, env) => {
+    gutil.log('Invalid theme id for',
+      gutil.colors.cyan(`${env}: ${themeId}`),
+      gutil.colors.yellow('`theme_id` must be an integer or "live".'),
+    );
+  },
+
   configError: () => {
     return '`config.yml` does not exist. You need to add a config file before you can upload your theme to Shopify.';
   },