@madebyseed/seed-cli-tools 1.9.3 → 2.0.0

package/lib/commands/deploy.js

@@ -11,8 +11,6 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _config = _interopRequireDefault(require("../config"));
 
-var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var logger = (0, _debug["default"])("seed-tools:deploy");
@@ -22,7 +20,6 @@ function _default(program) {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     logger("--gulpfile ".concat(_config["default"].gulpFile));
     logger("--cwd ".concat(_config["default"].themeRoot));
-    if (!(0, _utils.login)(options.store)) return;
     var args = [options.dev ? "deploy" : "deploy:no-sync", "--environment", options.env, "--store", options.store];
     if (options.skipOptimizations) args.push("--skip-optimizations");
     if (options["delete"]) args.push("--delete");

package/lib/commands/pull.js

@@ -11,8 +11,6 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _config = _interopRequireDefault(require("../config"));
 
-var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var logger = (0, _debug["default"])("seed-tools:deploy");
@@ -22,7 +20,6 @@ function _default(program) {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     logger("--gulpfile ".concat(_config["default"].gulpFile));
     logger("--cwd ".concat(_config["default"].themeRoot));
-    if (!(0, _utils.login)(options.store)) return;
     var args = [options.all ? "pull" : "pull:settings", "--environment", options.env, "--store", options.store];
     if (options.all) args.push("--all");
     if (options["delete"]) args.push("--delete");

package/lib/commands/watch.js

@@ -11,8 +11,6 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _config = _interopRequireDefault(require("../config"));
 
-var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var logger = (0, _debug["default"])("seed-tools:watch");
@@ -22,7 +20,6 @@ function _default(program) {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     logger("--gulpfile ".concat(_config["default"].gulpFile));
     logger("--cwd ".concat(_config["default"].themeRoot));
-    if (!(0, _utils.login)(options.store)) return;
     var gulpArgs = ["watch", "--gulpfile", _config["default"].gulpFile, "--cwd", _config["default"].themeRoot, "--environment", options.env];
     if (!options.optimize) gulpArgs.push("--skip-optimizations");
     process.env.NODE_ENV = options.optimize ? 'production' : 'development';

package/lib/gulpfile.js

@@ -79,7 +79,7 @@ gulp.task("pull", gulp.series("shopify:pull:origin:src"));
 
 gulp.task("pull:settings", gulp.series("generate:tmp", "shopify:pull:origin:tmp", "sync-settings:tmp:src", "clean"));
 /**
- * Syncronizes src folder theme settings with local development theme settings,
+ * Synchronizes src folder theme settings with local development theme settings,
  * then proceeds to do a full (re)build and push files into specified theme 
  * environment theme using shopify theme push, by default with the --no-delete flag
  *

package/lib/tasks/build-css.js

@@ -29,9 +29,11 @@ var assets = config.usesTailwind || tailwindConfig.mode === "jit" ? [config.src.
  */
 
 function processCss() {
-  return gulp.src(config.roots.css, {
-    allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
+  return new Promise(function (resolve, reject) {
+    gulp.src(config.roots.css, {
+      allowEmpty: true
+    }).pipe(plumber(utils.errorHandler)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets)).on('finish', resolve).on('error', reject);
+  });
 }
 /**
  * Process sass files
@@ -43,9 +45,11 @@ function processCss() {
 
 
 function processSass() {
-  return gulp.src(config.roots.scss, {
-    allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
+  return new Promise(function (resolve, reject) {
+    gulp.src(config.roots.scss, {
+      allowEmpty: true
+    }).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets)).on('finish', resolve).on('error', reject);
+  });
 }
 /**
  * Concatenate css via gulp-cssimport

package/lib/tasks/includes/config.js

@@ -144,13 +144,6 @@ if (config.usesTailwind) {
 }
 
 config.plugins.postcss.push(require('autoprefixer'));
-
-if (config.optimize) {
-  config.plugins.postcss.push(cssnano({
-    preset: "default"
-  }));
-}
-
 config.plugins.postcss.push(pxtorem({
   rootValue: 16,
   unitPrecision: 5,
@@ -160,6 +153,13 @@ config.plugins.postcss.push(pxtorem({
   mediaQuery: true,
   exclude: /node_modules/i
 }));
+
+if (config.optimize) {
+  config.plugins.postcss.push(cssnano({
+    preset: "default"
+  }));
+}
+
 config.plugins.postcss.push(reporter({
   clearReportedMessages: true
 }));

package/lib/tasks/shopify-cli.js

@@ -8,7 +8,8 @@ var _require = require("../utils"),
     logChildProcessOutput = _require.logChildProcessOutput,
     getDevThemeID = _require.getDevThemeID,
     setDevThemeID = _require.setDevThemeID,
-    getThemeID = _require.getThemeID;
+    getThemeID = _require.getThemeID,
+    getStoreName = _require.getStoreName;
 
 var config = require("./includes/config");
 
@@ -26,8 +27,9 @@ var store = config.store;
  */
 
 gulp.task("shopify:serve:dist", function () {
-  messages.logChildProcess("'shopify theme serve' on dist...");
-  var childProcess = shopifyCLI.serve({
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme dev --store ".concat(domain, "' on dist..."));
+  var childProcess = shopifyCLI.serve(domain, {
     stdio: ["inherit", "pipe", "inherit"]
   });
   childProcess.stdout.setEncoding("utf8");
@@ -44,14 +46,15 @@ gulp.task("shopify:serve:dist", function () {
  */
 
 gulp.task("shopify:pull:dev", function (done) {
-  messages.logChildProcess("'shopify theme pull' on development theme...");
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme pull --store ".concat(domain, "' on development theme..."));
   var devThemeId = getDevThemeID(config.themeRoot);
 
   if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
-  return shopifyCLI.pull(devThemeId);
+  return shopifyCLI.pull(domain, devThemeId);
 });
 /**
  * Pulls theme files from the development theme specified in seed config into tmp
@@ -62,14 +65,15 @@ gulp.task("shopify:pull:dev", function (done) {
  */
 
 gulp.task("shopify:pull:dev:tmp", function (done) {
-  messages.logChildProcess("'shopify theme pull' on tmp folder...");
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme pull --store ".concat(domain, "' on tmp folder..."));
   var devThemeId = getDevThemeID(config.themeRoot);
 
   if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
-  return shopifyCLI.pull(devThemeId, config.tmp.root);
+  return shopifyCLI.pull(domain, devThemeId, config.tmp.root);
 });
 /**
  * Pulls theme files from the seed config theme environment into tmp
@@ -80,8 +84,9 @@ gulp.task("shopify:pull:dev:tmp", function (done) {
  */
 
 gulp.task("shopify:pull:origin:tmp", function () {
-  messages.logChildProcess("'shopify theme pull ".concat(environment).concat(config.nodelete ? ' --nodelete' : '', "' into tmp..."));
-  return shopifyCLI.pull(getThemeID(config.themeRoot, environment, store), config.tmp.root);
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme pull --store ".concat(domain, " ").concat(environment).concat(config.nodelete ? ' --nodelete' : '', "' into tmp..."));
+  return shopifyCLI.pull(domain, getThemeID(config.themeRoot, environment, store), config.tmp.root);
 });
 /**
  * Pulls theme files from the seed config theme environment into src
@@ -92,8 +97,9 @@ gulp.task("shopify:pull:origin:tmp", function () {
  */
 
 gulp.task("shopify:pull:origin:src", function () {
-  messages.logChildProcess("'shopify theme pull ".concat(environment).concat(config.nodelete ? ' --nodelete' : '', "' into src..."));
-  return shopifyCLI.pull(getThemeID(config.themeRoot, environment, store), config.tmp.src, config.nodelete);
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme pull --store ".concat(domain, " ").concat(environment).concat(config.nodelete ? ' --nodelete' : '', "' into src..."));
+  return shopifyCLI.pull(domain, getThemeID(config.themeRoot, environment, store), config.tmp.src, config.nodelete);
 });
 /**
  * Initiates shopify's cli command 'shopify theme push' on the dist folder,
@@ -105,8 +111,9 @@ gulp.task("shopify:pull:origin:src", function () {
  */
 
 gulp.task("shopify:push:dist", function () {
-  messages.logChildProcess("'shopify theme push".concat(config.nodelete ? ' --nodelete' : '', "' on dist folder..."));
-  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment, store), config.nodelete);
+  var domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess("'shopify theme push --store ".concat(domain).concat(config.nodelete ? ' --nodelete' : '', "' on dist folder..."));
+  return shopifyCLI.push(domain, getThemeID(config.themeRoot, config.environment, store), config.nodelete);
 });
 /**
  * Initiates 'shopify theme package' on the dist folder, creating a zip.
@@ -117,8 +124,9 @@ gulp.task("shopify:push:dist", function () {
  */
 
 gulp.task("shopify:package:dist", function () {
+  var domain = getStoreName(config.themeRoot, store);
   messages.logChildProcess("shopify theme package on dist folder...");
-  return shopifyCLI["package"]();
+  return shopifyCLI["package"](domain);
 });
 /**
  * Takes the output of shopify cli serve, extracts dev theme ID and persists

package/lib/utils.js

@@ -50,7 +50,7 @@ var shopifyCLI = {
    * @returns {object} - spawnSync object or, node's <ChildProcess> object if async
    */
   login: function login(store) {
-    var args = ["login", "--store", store];
+    var args = ["switch", "--store", store];
     var options = {
       env: process.env,
       stdio: "inherit",
@@ -66,10 +66,9 @@ var shopifyCLI = {
    * @param {object} options - node spawn options
    * @returns {object} - node's ChildProcess
    */
-  serve: function serve() {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return (0, _crossSpawn["default"])("shopify theme", ["serve"], _objectSpread({
-      cwd: _config["default"].themeRoot + "/dist",
+  serve: function serve(store) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    return (0, _crossSpawn["default"])("shopify theme", ["dev", "--store", store, "--path", "dist"], _objectSpread({
       env: process.env,
       stdio: "inherit",
       shell: true
@@ -85,13 +84,13 @@ var shopifyCLI = {
    * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {object} - node's ChildProcess
    */
-  pull: function pull() {
-    var themeId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    var dir = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "./src";
-    var nodelete = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-    var args = ["pull"];
-    if (themeId) args = args.concat(["--theme", themeId, dir]);
-    if (nodelete) args.push('--nodelete');
+  pull: function pull(store) {
+    var themeId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var dir = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "./src";
+    var nodelete = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+    var args = ["pull", "--store", store];
+    if (themeId) args = args.concat(["--theme", themeId, "--path", dir]);
+    if (nodelete) args.push("--nodelete");
     return (0, _crossSpawn["default"])("shopify theme", args, {
       env: process.env,
       stdio: "inherit",
@@ -107,14 +106,13 @@ var shopifyCLI = {
    * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {ChildProcess} - node's ChildProcess
    */
-  push: function push() {
-    var themeId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    var nodelete = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    var args = ["push"];
+  push: function push(store) {
+    var themeId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var nodelete = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    var args = ["push", "--store", store, "--path", "dist"];
     if (themeId) args = args.concat(["--theme", themeId]);
-    if (nodelete) args.push('--nodelete');
+    if (nodelete) args.push("--nodelete");
     return (0, _crossSpawn["default"])("shopify theme", args, {
-      cwd: _config["default"].themeRoot + "/dist",
       env: process.env,
       stdio: "inherit",
       shell: true
@@ -123,13 +121,12 @@ var shopifyCLI = {
 
   /**
    * shopify theme package
-   * 
+   *
    * @memberof seed-cli.shopifyCLI
-   * @returns {ChildProcess} 
+   * @returns {ChildProcess}
    */
   "package": function _package() {
-    return (0, _crossSpawn["default"])("shopify theme", ["package"], {
-      cwd: _config["default"].themeRoot + "/dist",
+    return (0, _crossSpawn["default"])("shopify theme", ["package", "--path", "dist"], {
       env: process.env,
       stdio: "inherit",
       shell: true
@@ -222,7 +219,7 @@ function setDevThemeID(themeID) {
   (0, _fs.writeFileSync)(_config["default"].seedConfig, data.join(_config["default"].seedConfigDelimiter));
 }
 /**
- * Logs into seed config shopify store while logging useful messages 
+ * Logs into seed config shopify store while logging useful messages
  * and handling errors.
  * @returns {boolean} whether login was succesful or not
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.9.3",
+  "version": "2.0.0",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -56,5 +56,5 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "80b3e39806640fcd23dada52c0dbfb9787064b63"
+  "gitHead": "a8c9eb026df4d667622adaf419241b140964f5dc"
 }

package/src/commands/deploy.js

@@ -1,7 +1,6 @@
 import spawn from "cross-spawn";
 import debug from "debug";
 import config from "../config";
-import { login } from "../utils";
 
 const logger = debug("seed-tools:deploy");
 
@@ -40,7 +39,6 @@ export default function (program) {
       logger(`--gulpfile ${config.gulpFile}`);
       logger(`--cwd ${config.themeRoot}`);
 
-      if (!login(options.store)) return;
 
       const args = [
         options.dev ? "deploy" : "deploy:no-sync",

package/src/commands/pull.js

@@ -1,7 +1,6 @@
 import spawn from "cross-spawn";
 import debug from "debug";
 import config from "../config";
-import { login } from "../utils";
 
 const logger = debug("seed-tools:deploy");
 
@@ -30,7 +29,6 @@ export default function (program) {
     .action((options = {}) => {
       logger(`--gulpfile ${config.gulpFile}`);
       logger(`--cwd ${config.themeRoot}`);
-      if (!login(options.store)) return;
 
       const args = [
         options.all ? "pull" : "pull:settings",

package/src/commands/watch.js

@@ -1,7 +1,6 @@
 import spawn from "cross-spawn";
 import debug from "debug";
 import config from "../config";
-import { login } from "../utils";
 
 const logger = debug("seed-tools:watch");
 
@@ -27,8 +26,6 @@ export default function (program) {
       logger(`--gulpfile ${config.gulpFile}`);
       logger(`--cwd ${config.themeRoot}`);
 
-      if (!login(options.store)) return;
-
       const gulpArgs = [
         "watch",
         "--gulpfile",

package/src/gulpfile.js

@@ -101,7 +101,7 @@ gulp.task(
 
 
 /**
- * Syncronizes src folder theme settings with local development theme settings,
+ * Synchronizes src folder theme settings with local development theme settings,
  * then proceeds to do a full (re)build and push files into specified theme 
  * environment theme using shopify theme push, by default with the --no-delete flag
  *

package/src/tasks/build-css.js

@@ -38,10 +38,15 @@ const assets =
  * @private
  */
 function processCss() {
-  return gulp.src(config.roots.css, { allowEmpty: true })
+  return new Promise((resolve, reject) => {
+    gulp.src(config.roots.css, { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
     .pipe(postcss(config.plugins.postcss))
     .pipe(gulp.dest(config.dist.assets))
+    .on('finish', resolve)
+    .on('error', reject)
+  })
+
 }
 
 /**
@@ -52,11 +57,16 @@ function processCss() {
  * @private
  */
  function processSass() {
-  return gulp.src(config.roots.scss, { allowEmpty: true })
+  return new Promise((resolve, reject) => {
+    gulp.src(config.roots.scss, { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
     .pipe(sass())
     .pipe(postcss(config.plugins.postcss))
     .pipe(gulp.dest(config.dist.assets))
+    .on('finish', resolve)
+    .on('error', reject)
+  })
+
 }
 
 /**

package/src/tasks/includes/config.js

@@ -147,10 +147,6 @@ if (config.usesTailwind) {
 
 config.plugins.postcss.push(require('autoprefixer'))
 
-if (config.optimize) {
-  config.plugins.postcss.push((cssnano({ preset: "default" })))
-}
-
 config.plugins.postcss.push(pxtorem({
   rootValue: 16,
   unitPrecision: 5,
@@ -161,6 +157,10 @@ config.plugins.postcss.push(pxtorem({
   exclude: /node_modules/i
 }))
 
+if (config.optimize) {
+  config.plugins.postcss.push((cssnano({ preset: "default" })))
+}
+
 config.plugins.postcss.push(reporter({ clearReportedMessages: true }))
 
 module.exports = config;

package/src/tasks/shopify-cli.js

@@ -7,6 +7,7 @@ const {
   getDevThemeID,
   setDevThemeID,
   getThemeID,
+  getStoreName,
 } = require("../utils");
 const config = require("./includes/config");
 const messages = require("./includes/messages")
@@ -23,8 +24,9 @@ const store = config.store;
  * @static
  */
 gulp.task("shopify:serve:dist", () => {
-  messages.logChildProcess("'shopify theme serve' on dist...");
-  const childProcess = shopifyCLI.serve({
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(`'shopify theme dev --store ${domain}' on dist...`);
+  const childProcess = shopifyCLI.serve(domain, {
     stdio: ["inherit", "pipe", "inherit"],
   });
   childProcess.stdout.setEncoding("utf8");
@@ -41,13 +43,14 @@ gulp.task("shopify:serve:dist", () => {
  * @static
  */
 gulp.task("shopify:pull:dev", (done) => {
-  messages.logChildProcess("'shopify theme pull' on development theme...");
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(`'shopify theme pull --store ${domain}' on development theme...`);
   const devThemeId = getDevThemeID(config.themeRoot);
   if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
-  return shopifyCLI.pull(devThemeId);
+  return shopifyCLI.pull(domain, devThemeId);
 });
 
 /**
@@ -58,13 +61,17 @@ gulp.task("shopify:pull:dev", (done) => {
  * @static
  */
 gulp.task("shopify:pull:dev:tmp", (done) => {
-  messages.logChildProcess("'shopify theme pull' on tmp folder...");
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(
+    `'shopify theme pull --store ${domain}' on tmp folder...`
+  );
   const devThemeId = getDevThemeID(config.themeRoot);
   if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
   return shopifyCLI.pull(
+    domain,
     devThemeId,
     config.tmp.root
   );
@@ -78,8 +85,10 @@ gulp.task("shopify:pull:dev:tmp", (done) => {
  * @static
  */
 gulp.task("shopify:pull:origin:tmp", () => {
-  messages.logChildProcess(`'shopify theme pull ${environment}${config.nodelete ? ' --nodelete' : ''}' into tmp...`);
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(`'shopify theme pull --store ${domain} ${environment}${config.nodelete ? ' --nodelete' : ''}' into tmp...`);
   return shopifyCLI.pull(
+    domain,
     getThemeID(config.themeRoot, environment, store),
     config.tmp.root
   );
@@ -93,8 +102,10 @@ gulp.task("shopify:pull:origin:tmp", () => {
  * @static
  */
 gulp.task("shopify:pull:origin:src", () => {
-  messages.logChildProcess(`'shopify theme pull ${environment}${config.nodelete ? ' --nodelete' : ''}' into src...`);
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(`'shopify theme pull --store ${domain} ${environment}${config.nodelete ? ' --nodelete' : ''}' into src...`);
   return shopifyCLI.pull(
+    domain,
     getThemeID(config.themeRoot, environment, store),
     config.tmp.src,
     config.nodelete
@@ -110,8 +121,9 @@ gulp.task("shopify:pull:origin:src", () => {
  * @static
  */
 gulp.task("shopify:push:dist", () => {
-  messages.logChildProcess(`'shopify theme push${config.nodelete ? ' --nodelete' : ''}' on dist folder...`);
-  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment, store), config.nodelete);
+  const domain = getStoreName(config.themeRoot, store);
+  messages.logChildProcess(`'shopify theme push --store ${domain}${config.nodelete ? ' --nodelete' : ''}' on dist folder...`);
+  return shopifyCLI.push(domain, getThemeID(config.themeRoot, config.environment, store), config.nodelete);
 });
 
 /**
@@ -122,8 +134,9 @@ gulp.task("shopify:push:dist", () => {
  * @static 
  */
 gulp.task("shopify:package:dist", () => {
+  const domain = getStoreName(config.themeRoot, store);
   messages.logChildProcess("shopify theme package on dist folder...")
-  return shopifyCLI.package();
+  return shopifyCLI.package(domain);
 })
 
 /**

package/src/utils.js

@@ -21,7 +21,7 @@ export const shopifyCLI = {
    * @returns {object} - spawnSync object or, node's <ChildProcess> object if async
    */
   login: (store) => {
-    const args = ["login", "--store", store];
+    const args = ["switch", "--store", store];
     const options = {
       env: process.env,
       stdio: "inherit",
@@ -38,9 +38,8 @@ export const shopifyCLI = {
    * @param {object} options - node spawn options
    * @returns {object} - node's ChildProcess
    */
-  serve: (options = {}) => {
-    return spawn("shopify theme", ["serve"], {
-      cwd: config.themeRoot + "/dist",
+  serve: (store, options = {}) => {
+    return spawn("shopify theme", ["dev", "--store", store, "--path", "dist"], {
       env: process.env,
       stdio: "inherit",
       shell: true,
@@ -57,11 +56,11 @@ export const shopifyCLI = {
    * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {object} - node's ChildProcess
    */
-  pull: (themeId = null, dir = "./src", nodelete = true) => {
-    let args = ["pull"];
-    if (themeId) args = args.concat(["--theme", themeId, dir]);
+  pull: (store, themeId = null, dir = "./src", nodelete = true) => {
+    let args = ["pull", "--store", store];
+    if (themeId) args = args.concat(["--theme", themeId, "--path", dir]);
 
-    if (nodelete) args.push('--nodelete')
+    if (nodelete) args.push("--nodelete");
 
     return spawn("shopify theme", args, {
       env: process.env,
@@ -78,14 +77,13 @@ export const shopifyCLI = {
    * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {ChildProcess} - node's ChildProcess
    */
-  push: (themeId = null, nodelete = true) => {
-    let args = ["push"];
+  push: (store, themeId = null, nodelete = true) => {
+    let args = ["push", "--store", store, "--path", "dist"];
     if (themeId) args = args.concat(["--theme", themeId]);
 
-    if (nodelete) args.push('--nodelete')
+    if (nodelete) args.push("--nodelete");
 
     return spawn("shopify theme", args, {
-      cwd: config.themeRoot + "/dist",
       env: process.env,
       stdio: "inherit",
       shell: true,
@@ -94,18 +92,17 @@ export const shopifyCLI = {
 
   /**
    * shopify theme package
-   * 
+   *
    * @memberof seed-cli.shopifyCLI
-   * @returns {ChildProcess} 
+   * @returns {ChildProcess}
    */
   package: () => {
-    return spawn("shopify theme", ["package"], {
-      cwd: config.themeRoot + "/dist",
+    return spawn("shopify theme", ["package", "--path", "dist"], {
       env: process.env,
       stdio: "inherit",
       shell: true,
     });
-  }
+  },
 };
 
 /**
@@ -123,9 +120,9 @@ export function getSeedConfig(themeRoot) {
  * @param {string} themeRoot - the path to theme root dir
  */
 export function getStoreName(themeRoot, store) {
-  return store ? 
-    getSeedConfig(themeRoot).stores[store].domain : 
-    getSeedConfig(themeRoot).store;
+  return store
+    ? getSeedConfig(themeRoot).stores[store].domain
+    : getSeedConfig(themeRoot).store;
 }
 
 /**
@@ -136,9 +133,9 @@ export function getStoreName(themeRoot, store) {
  * @returns {string} themeID
  */
 export function getThemeID(themeRoot, environment, store) {
-  return store ? 
-    getSeedConfig(themeRoot).stores[store].themes[environment] :
-    getSeedConfig(themeRoot).themes[environment];
+  return store
+    ? getSeedConfig(themeRoot).stores[store].themes[environment]
+    : getSeedConfig(themeRoot).themes[environment];
 }
 
 /**
@@ -187,9 +184,8 @@ export function setDevThemeID(themeID) {
   writeFileSync(config.seedConfig, data.join(config.seedConfigDelimiter));
 }
 
-
 /**
- * Logs into seed config shopify store while logging useful messages 
+ * Logs into seed config shopify store while logging useful messages
  * and handling errors.
  * @returns {boolean} whether login was succesful or not
  */
@@ -200,13 +196,15 @@ export function login(store) {
     storeErrorMessage(store);
     return false;
   }
-  
-  console.log(`Logging into ${yellow(domain)} with Shopify CLI...`)
+
+  console.log(`Logging into ${yellow(domain)} with Shopify CLI...`);
   const loginProcess = shopifyCLI.login(domain);
   if (loginProcess.error) {
     console.log("");
     console.log(
-      red(`  ${figures.cross} Failed logging into ${domain}, are you sure you're using the correct account?`)
+      red(
+        `  ${figures.cross} Failed logging into ${domain}, are you sure you're using the correct account?`
+      )
     );
     console.log("");
     return false;
@@ -215,16 +213,13 @@ export function login(store) {
   return true;
 }
 
-
 /**
  * Outputs error message if there's no store field in seed config
  */
 export function storeErrorMessage(store) {
   if (store) {
     console.log("");
-    console.log(
-      red(`  The store ${store} does not exist in seed.config.js`)
-    );
+    console.log(red(`  The store ${store} does not exist in seed.config.js`));
     console.log(
       "    Check to see if you spelled the store correctly on seed config and when running the command."
     );
@@ -232,12 +227,13 @@ export function storeErrorMessage(store) {
   } else {
     console.log("");
     console.log(
-      red(`  ${figures.cross} no store field in seed.config.js. Did you forget the --store <store> argument?`)
+      red(
+        `  ${figures.cross} no store field in seed.config.js. Did you forget the --store <store> argument?`
+      )
     );
     console.log(
       "    If this is a multi-store project, please specify which store to watch, else add 'store: <store.myshopify.com>' to your project seed.config.js"
     );
     console.log("");
   }
-
 }