@madebyseed/seed-cli-tools 1.2.4 → 1.3.0

package/lib/commands/deploy.js

@@ -11,17 +11,22 @@ 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");
 
 function _default(program) {
-  program.command("deploy").alias("d").description("Runs a full deploy of your theme's code to a Shopify store specified in seed.config.js. This runs shopify theme push with the --nodelete flag, so that files aren't deleted.").option("-e, --env <environment>[,<environment>...]", "Shopify store(s) to deploy code to (specified in seed.config.js)", "development").option("-s, --skip-optimizations", "Skips asset optimization steps such as compression, minification and purging.", false).action(function () {
+  program.command("deploy").alias("d").description("Runs a full deploy of your theme's code to a Shopify store specified in seed.config.js. This runs shopify theme push with the --nodelete flag, so that files aren't deleted.").option("-e, --env <environment>[,<environment>...]", "Shopify store(s) to deploy code to (specified in seed.config.js)", "development").option("-n, --no-dev", "Skips pulling theme settings from local development theme", false).option("-s, --skip-optimizations", "Skips asset optimization steps such as compression, minification and purging.", false).option("-d, --delete", "By default seed deploy runs 'shopify theme push --nodelete'. With this option it will leave out the --no-delete flag, allowind files to be delete in store theme.", false).action(function () {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     logger("--gulpfile ".concat(_config["default"].gulpFile));
     logger("--cwd ".concat(_config["default"].themeRoot));
-    var args = ["deploy", "--environment", options.env];
-    if (options.skipOptimizations) args.push("--skip-optimization");else process.env.NODE_ENV = "production";
+    if (!(0, _utils.login)()) return;
+    var args = [options.dev ? "deploy" : "deploy:no-sync", "--environment", options.env];
+    if (options.skipOptimizations) args.push('--skip-optimizations');
+    if (options["delete"]) args.push('--delete');
+    if (!options.skipOptimizations) process.env.NODE_ENV = "production";
     (0, _crossSpawn["default"])(_config["default"].gulp, args.concat(["--gulpfile", _config["default"].gulpFile, "--cwd", _config["default"].themeRoot]), {
       detached: false,
       stdio: "inherit"

package/lib/commands/pull.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _crossSpawn = _interopRequireDefault(require("cross-spawn"));
+
+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");
+
+function _default(program) {
+  program.command("pull").alias("p").description("Pulls the specified theme into your src folder. By default, it only pulls theme settings, if you want to pull all files use the --all flag.").option("-e, --env <environment>[,<environment>...]", "Shopify store(s) to deploy code to (specified in seed.config.js)", "development").option("-a, --all", "Pulls all files from specified theme", false).option("-d, --delete", "By default seed pull doesn't delete any files in you src folder, with this options it will delete any files that diverge from the pulled theme.", false).action(function () {
+    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)()) return;
+    var args = [options.all ? "pull" : "pull:settings", "--environment", options.env];
+    if (options.all) args.push('--all');
+    if (options["delete"]) args.push('--delete');
+    (0, _crossSpawn["default"])(_config["default"].gulp, args.concat(["--gulpfile", _config["default"].gulpFile, "--cwd", _config["default"].themeRoot]), {
+      detached: false,
+      stdio: "inherit"
+    });
+  });
+}

package/lib/commands/watch.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = _default;
 
-var _chalk = require("chalk");
-
-var _figures = _interopRequireDefault(require("figures"));
-
 var _crossSpawn = _interopRequireDefault(require("cross-spawn"));
 
 var _debug = _interopRequireDefault(require("debug"));
@@ -26,27 +22,7 @@ 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));
-    var store = (0, _utils.getStoreName)(_config["default"].themeRoot);
-
-    if (!store) {
-      console.log("");
-      console.log((0, _chalk.red)("  ".concat(_figures["default"].cross, " no store field in seed.config.js")));
-      console.log("    Add 'store: <store.myshopify.com>' to your project seed.config.js");
-      console.log("");
-      return;
-    }
-
-    console.log("Logging into ".concat((0, _chalk.yellow)(store), " with Shopify CLI..."));
-
-    var loginProcess = _utils.shopifyCLI.login(store);
-
-    if (loginProcess.error) {
-      console.log("");
-      console.log((0, _chalk.red)("  ".concat(_figures["default"].cross, " Failed logging into ").concat(store, ", are you sure you're using the correct account?")));
-      console.log("");
-      return;
-    }
-
+    if (!(0, _utils.login)()) 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

@@ -45,9 +45,29 @@ gulp.task("sync-settings", gulp.series("generate:tmp", "shopify:pull:dev:tmp", "
 
 gulp.task("watch", gulp.series("build", gulp.parallel("watch:src", "watch:dist", "shopify:serve:dist")));
 /**
- * Does a full (re)build followed by a full deploy, cleaning existing files on
- * the remote server and replacing them with the full set of files pushed to
- * `dist` in the build
+ *
+ * @summary pulls theme from specified environment theme into src
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy
+ * @static
+ */
+
+gulp.task("pull", gulp.series("shopify:pull:origin:src"));
+/**
+ * Does a full (re)build and push dist files into specified theme environment,
+ * theme using shopify theme push, by default with the --no-delete flag
+ *
+ * @summary pulls theme settings from specified environment theme into src
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy
+ * @static
+ */
+
+gulp.task("pull:settings", gulp.series("generate:tmp", "shopify:pull:origin:tmp", "sync-settings:tmp:src"));
+/**
+ * Syncronizes 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
  *
  * @summary Deploy your built files to the Shopify Store set in
  *   `slate-cli.config`
@@ -56,4 +76,16 @@ gulp.task("watch", gulp.series("build", gulp.parallel("watch:src", "watch:dist",
  * @static
  */
 
-gulp.task("deploy", gulp.series("sync-settings", "build", "shopify:push:dist"));
+gulp.task("deploy", gulp.series("sync-settings", "build", "shopify:push:dist"));
+/**
+ * Does a full (re)build and push dist files into specified theme environment,
+ * theme using shopify theme push, by default with the --no-delete flag
+ *
+ * @summary Deploy your built files to the Shopify Store set in
+ *   `slate-cli.config`
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy:no-sync
+ * @static
+ */
+
+gulp.task("deploy:no-sync", gulp.series("build", "shopify:push:dist"));

package/lib/tasks/build-svg.js

@@ -10,10 +10,6 @@ var size = require('gulp-size');
 
 var chokidar = require('chokidar');
 
-var svgmin = require('gulp-svgmin');
-
-var cheerio = require('gulp-cheerio');
-
 var extReplace = require('gulp-ext-replace');
 
 var plumber = require('gulp-plumber');
@@ -35,7 +31,7 @@ var messages = require('./includes/messages.js');
 
 function processIcons(files) {
   messages.logProcessFiles('build:svg');
-  return gulp.src(files).pipe(plumber(utils.errorHandler)).pipe(svgmin()).pipe(cheerio(config.plugins.cheerio)).pipe(extReplace('.liquid')).pipe(size({
+  return gulp.src(files).pipe(plumber(utils.errorHandler)).pipe(extReplace('.liquid')).pipe(size({
     showFiles: true,
     pretty: true
   })).pipe(gulp.dest(config.dist.snippets));

package/lib/tasks/build-utils.js

@@ -88,6 +88,7 @@ gulp.task("generate:tmp", function () {
  */
 
 gulp.task("sync-settings:tmp:src", function () {
+  messages.logProcessFiles('Syncronizing /tmp theme settings with /src');
   return copyFiles(themeSettingsAssets, {
     base: config.tmp.root
   }, config.src.root);

package/lib/tasks/includes/config.js

@@ -10,6 +10,8 @@ var tailwindcss = require("tailwindcss");
 
 var cssnano = require("cssnano");
 
+var pxtorem = require('postcss-pxtorem');
+
 var argv = require("minimist")(process.argv.slice(2));
 
 var themeRoot = findRoot(process.cwd());
@@ -38,6 +40,10 @@ try {
  * @memberof seed-cli
  * @summary Configuring seed-cli
  *  @prop {String} environment - development | staging | production
+ *  @prop {Boolean} optimize - whether optimize assets or not
+ *  @prop {Boolean} nodelete - run shopiy cli commands with --no-delete flag
+ *  @prop {String} tailwindConfig - tailwind config filename
+ *  @prop {String} seedConfig - seed config filename
  *  @prop {String} deployLog - path to deploy log file
  *  @prop {String} src - globs (multi-filename matching patterns) for various source files
  *  @prop {String} tmp - globs (multi-filename matching patterns) for various tmp files
@@ -50,6 +56,7 @@ try {
 var config = {
   environment: argv.environment === "undefined" ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
+  nodelete: !argv["delete"],
   themeRoot: themeRoot,
   packageJson: pkg,
   tailwindConfig: tailwindConfig,
@@ -103,12 +110,17 @@ var config = {
     css: "src/styles/*.{css,scss}"
   },
   plugins: {
-    cheerio: {
-      run: require("./utilities.js").processSvg
-    },
     postcss: [require('postcss-import'), tailwindcss({
       config: join(themeRoot, tailwindConfig)
-    }), require('autoprefixer')]
+    }), require('autoprefixer'), pxtorem({
+      rootValue: 16,
+      unitPrecision: 5,
+      propList: ['*'],
+      selectorBlackList: [],
+      replace: true,
+      mediaQuery: true,
+      exclude: /node_modules/i
+    })]
   }
 };
 

package/lib/tasks/includes/utilities.js

@@ -67,49 +67,6 @@ var utilities = {
     }).thenReturn(results).all();
   },
 
-  /**
-   * Function passed to cheerio.run - adds aria tags & other accessibility
-   * based information to each svg element's markup...
-   *
-   * @memberof seed-cli.utilities
-   * @param {Function} $ - jQuery reference
-   * @param {fs} file - reference to current icon file?
-   */
-  processSvg: function processSvg($, file) {
-    var $svg = $("svg"); // eslint-disable-line no-var
-
-    var $newSvg = $('<svg aria-hidden="true" focusable="false" role="presentation" class="icon" />'); // eslint-disable-line no-var
-
-    var fileName = file.relative.replace(".svg", ""); // eslint-disable-line no-var
-
-    var viewBoxAttr = $svg.attr("viewbox"); // eslint-disable-line no-var
-    // Add necessary attributes
-
-    if (viewBoxAttr) {
-      var width = parseInt(viewBoxAttr.split(" ")[2], 10); // eslint-disable-line no-var
-
-      var height = parseInt(viewBoxAttr.split(" ")[3], 10); // eslint-disable-line no-var
-
-      var widthToHeightRatio = width / height; // eslint-disable-line no-var
-
-      if (widthToHeightRatio >= 1.5) {
-        $newSvg.addClass("icon--wide");
-      }
-
-      $newSvg.attr("viewBox", viewBoxAttr);
-    } // Add required classes to full color icons
-
-
-    if (file.relative.indexOf("-full-color") >= 0) {
-      $newSvg.addClass("icon--full-color");
-    }
-
-    $newSvg.addClass(fileName).append($svg.contents());
-    $newSvg.append($svg.contents());
-    $svg.after($newSvg);
-    $svg.remove();
-  },
-
   /**
    * Factory for creating an event cache - used with a short debounce to batch any
    * file changes that occur in rapid succession during Watch tasks.

package/lib/tasks/shopify-cli.js

@@ -13,6 +13,8 @@ var _require = require("../utils"),
 var config = require("./includes/config");
 
 var messages = require("./includes/messages");
+
+var environment = config.environment.split(/\s*,\s*|\s+/)[0];
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
  * watching files and uploading them to development store
@@ -22,7 +24,6 @@ var messages = require("./includes/messages");
  * @static
  */
 
-
 gulp.task("shopify:serve:dist", function () {
   messages.logChildProcess("'shopify theme serve' on dist...");
   var childProcess = shopifyCLI.serve({
@@ -45,7 +46,7 @@ gulp.task("shopify:pull:dev", function (done) {
   messages.logChildProcess("'shopify theme pull' on development theme...");
   var devThemeId = getDevThemeID(config.themeRoot);
 
-  if (!devThemeId) {
+  if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
@@ -63,12 +64,36 @@ gulp.task("shopify:pull:dev:tmp", function (done) {
   messages.logChildProcess("'shopify theme pull' on tmp folder...");
   var devThemeId = getDevThemeID(config.themeRoot);
 
-  if (!devThemeId) {
+  if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
   return shopifyCLI.pull(devThemeId, config.tmp.root);
 });
+/**
+ * Pulls theme files from the seed config theme enviroment into src
+ *
+ * @function shopify:pull:dev
+ * @memberof seed-cli.tasks.deploy
+ * @static
+ */
+
+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), config.tmp.root);
+});
+/**
+ * Pulls theme files from the seed config theme enviroment into src
+ *
+ * @function shopify:pull:dev
+ * @memberof seed-cli.tasks.deploy
+ * @static
+ */
+
+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), config.tmp.src, config.nodelete);
+});
 /**
  * Initiates shopify's cli command 'shopify theme push' on the dist folder,
  * pushing it to stores theme
@@ -79,8 +104,8 @@ gulp.task("shopify:pull:dev:tmp", function (done) {
  */
 
 gulp.task("shopify:push:dist", function () {
-  messages.logChildProcess("'shopify theme push' on dist folder...");
-  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment));
+  messages.logChildProcess("'shopify theme push".concat(config.nodelete ? ' --nodelete' : '', "' on dist folder..."));
+  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment), config.nodelete);
 });
 /**
  * Takes the output of shopify cli serve, extracts dev theme ID and persists

package/lib/utils.js

@@ -10,8 +10,14 @@ exports.getDevThemeID = getDevThemeID;
 exports.extractThemeId = extractThemeId;
 exports.logChildProcessOutput = logChildProcessOutput;
 exports.setDevThemeID = setDevThemeID;
+exports.login = login;
+exports.storeErrorMessage = storeErrorMessage;
 exports.shopifyCLI = void 0;
 
+var _chalk = require("chalk");
+
+var _figures = _interopRequireDefault(require("figures"));
+
 var _crossSpawn = _interopRequireDefault(require("cross-spawn"));
 
 var _path = require("path");
@@ -41,25 +47,23 @@ var shopifyCLI = {
    *
    * @memberof seed-cli.shopifyCLI
    * @param {string} store - store's myshopify domain name
-   * @param {boolean} async - login asynchronously
-   *
    * @returns {object} - spawnSync object or, node's <ChildProcess> object if async
    */
   login: function login(store) {
-    var async = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var args = ["login", "--store", store];
     var options = {
       env: process.env,
       stdio: "inherit",
       shell: true
     };
-    if (async) return (0, _crossSpawn["default"])("shopify", args, options);else return _crossSpawn["default"].sync("shopify", args, options);
+    return _crossSpawn["default"].sync("shopify", args, options);
   },
 
   /**
    * shopify theme serve
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {object} options - node spawn options
    * @returns {object} - node's ChildProcess
    */
   serve: function serve() {
@@ -76,13 +80,18 @@ var shopifyCLI = {
    * shopify theme push
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {string} themeId - shopify theme id to pull from
+   * @param {string} dir - directory to pull into
+   * @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(["--themeid", themeId, dir]);
+    if (nodelete) args.push('--nodelete');
     return (0, _crossSpawn["default"])("shopify theme", args, {
       env: process.env,
       stdio: "inherit",
@@ -94,12 +103,16 @@ var shopifyCLI = {
    * shopify theme push
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {string} themeId - shopify theme id to push into
+   * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {object} - node's ChildProcess
    */
   push: function push() {
     var themeId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    var args = ["push", "--nodelete"];
+    var nodelete = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    var args = ["push"];
     if (themeId) args = args.concat(["--themeid", themeId]);
+    if (nodelete) args.push('--nodelete');
     return (0, _crossSpawn["default"])("shopify theme", args, {
       cwd: _config["default"].themeRoot + "/dist",
       env: process.env,
@@ -192,4 +205,42 @@ function setDevThemeID(themeID) {
   data = data.split(_config["default"].seedConfigDelimiter);
   data[1] = "\n  __developmentThemeId: '".concat(themeID, "'") + "\n};";
   (0, _fs.writeFileSync)(_config["default"].seedConfig, data.join(_config["default"].seedConfigDelimiter));
+}
+/**
+ * Logs into seed config shopify store while logging useful messages 
+ * and handling errors.
+ * @returns {boolean} whether login was succesful or not
+ */
+
+
+function login() {
+  var store = getStoreName(_config["default"].themeRoot);
+
+  if (!store) {
+    storeErrorMessage();
+    return false;
+  }
+
+  console.log("Logging into ".concat((0, _chalk.yellow)(store), " with Shopify CLI..."));
+  var loginProcess = shopifyCLI.login(store);
+
+  if (loginProcess.error) {
+    console.log("");
+    console.log((0, _chalk.red)("  ".concat(_figures["default"].cross, " Failed logging into ").concat(store, ", are you sure you're using the correct account?")));
+    console.log("");
+    return false;
+  }
+
+  return true;
+}
+/**
+ * Outputs error message if there's no store field in seed config
+ */
+
+
+function storeErrorMessage() {
+  console.log("");
+  console.log((0, _chalk.red)("  ".concat(_figures["default"].cross, " no store field in seed.config.js")));
+  console.log("    Add 'store: <store.myshopify.com>' to your project seed.config.js");
+  console.log("");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,6 @@
     "figures": "^3.2.0",
     "find-root": "^1.1.0",
     "gulp": "^4.0.2",
-    "gulp-cheerio": "^1.0.0",
     "gulp-ext-replace": "^0.3.0",
     "gulp-if": "^3.0.0",
     "gulp-include": "^2.4.1",
@@ -42,16 +41,16 @@
     "gulp-postcss": "^9.0.0",
     "gulp-sass": "^5.0.0",
     "gulp-size": "^4.0.1",
-    "gulp-svgmin": "^4.0.1",
     "gulp-uglify": "^3.0.2",
     "gulp-zip": "^5.1.0",
     "postcss": "^8.3.6",
     "postcss-import": "^14.0.2",
+    "postcss-pxtorem": "^6.0.0",
     "require-directory": "^2.1.1",
     "sass": "^1.36.0",
     "tailwindcss": "^2.2.7",
     "vinyl-paths": "^3.0.1",
     "yargs": "^17.0.1"
   },
-  "gitHead": "885945f7fe51b109d4c05ea667d4b5f6c24af13a"
+  "gitHead": "e473267c834d1763af02e4e1b20339b628a6dc3c"
 }

package/src/commands/deploy.js

@@ -1,6 +1,7 @@
 import spawn from "cross-spawn";
 import debug from "debug";
 import config from "../config";
+import { login } from "../utils";
 
 const logger = debug("seed-tools:deploy");
 
@@ -16,19 +17,37 @@ export default function (program) {
       "Shopify store(s) to deploy code to (specified in seed.config.js)",
       "development"
     )
+    .option(
+      "-n, --no-dev",
+      "Skips pulling theme settings from local development theme",
+      false
+    )
     .option(
       "-s, --skip-optimizations",
       "Skips asset optimization steps such as compression, minification and purging.",
       false
     )
+    .option(
+      "-d, --delete",
+      "By default seed deploy runs 'shopify theme push --nodelete'. With this option it will leave out the --no-delete flag, allowind files to be delete in store theme.",
+      false
+    )
     .action((options = {}) => {
       logger(`--gulpfile ${config.gulpFile}`);
       logger(`--cwd ${config.themeRoot}`);
 
-      const args = ["deploy", "--environment", options.env];
+      if (!login()) return;
+
+      const args = [
+        options.dev ? "deploy"   : "deploy:no-sync", 
+        "--environment", options.env, 
+      ];
+
+      if (options.skipOptimizations) args.push('--skip-optimizations')
+      if (options.delete) args.push('--delete')
 
-      if (options.skipOptimizations) args.push("--skip-optimization");
-      else process.env.NODE_ENV = "production";
+      if (!options.skipOptimizations) 
+        process.env.NODE_ENV = "production";
 
       spawn(
         config.gulp,

package/src/commands/pull.js

@@ -0,0 +1,53 @@
+import spawn from "cross-spawn";
+import debug from "debug";
+import config from "../config";
+import { login } from "../utils";
+
+const logger = debug("seed-tools:deploy");
+
+export default function (program) {
+  program
+    .command("pull")
+    .alias("p")
+    .description(
+      "Pulls the specified theme into your src folder. By default, it only pulls theme settings, if you want to pull all files use the --all flag."
+    )
+    .option(
+      "-e, --env <environment>[,<environment>...]",
+      "Shopify store(s) to deploy code to (specified in seed.config.js)",
+      "development"
+    )
+    .option(
+      "-a, --all",
+      "Pulls all files from specified theme",
+      false
+    )
+    .option(
+      "-d, --delete",
+      "By default seed pull doesn't delete any files in you src folder, with this options it will delete any files that diverge from the pulled theme.",
+      false
+    )
+    .action((options = {}) => {
+      logger(`--gulpfile ${config.gulpFile}`);
+      logger(`--cwd ${config.themeRoot}`);
+      if (!login()) return;
+
+
+      const args = [
+        options.all ? "pull" : "pull:settings", 
+        "--environment", options.env
+      ];
+
+      if (options.all) args.push('--all')
+      if (options.delete) args.push('--delete')
+
+      spawn(
+        config.gulp,
+        args.concat(["--gulpfile", config.gulpFile, "--cwd", config.themeRoot]),
+        {
+          detached: false,
+          stdio: "inherit",
+        }
+      );
+    });
+}

package/src/commands/watch.js

@@ -1,9 +1,7 @@
-import { red, yellow } from "chalk";
-import figures from "figures";
 import spawn from "cross-spawn";
 import debug from "debug";
 import config from "../config";
-import { getStoreName, shopifyCLI } from "../utils";
+import { login } from "../utils";
 
 const logger = debug("seed-tools:watch");
 
@@ -23,31 +21,8 @@ export default function (program) {
     .action((options = {}) => {
       logger(`--gulpfile ${config.gulpFile}`);
       logger(`--cwd ${config.themeRoot}`);
-      const store = getStoreName(config.themeRoot);
 
-      if (!store) {
-        console.log("");
-        console.log(
-          red(`  ${figures.cross} no store field in seed.config.js`)
-        );
-        console.log(
-          "    Add 'store: <store.myshopify.com>' to your project seed.config.js"
-        );
-        console.log("");
-        return;
-      }
-
-      console.log(`Logging into ${yellow(store)} with Shopify CLI...`)
-      const loginProcess = shopifyCLI.login(store);
-      if (loginProcess.error) {
-        console.log("");
-        console.log(
-          red(`  ${figures.cross} Failed logging into ${store}, are you sure you're using the correct account?`)
-        );
-        console.log("");
-
-        return;
-      }
+      if (!login()) return;
 
       const gulpArgs = [
         "watch",

package/src/config.js

@@ -2,6 +2,7 @@ import { join, normalize } from "path";
 import { existsSync } from "fs";
 import findRoot from "find-root";
 
+
 const workingDirectory = process.cwd();
 const currentDirectory = __dirname;
 

package/src/gulpfile.js

@@ -63,10 +63,32 @@ gulp.task(
   )
 );
 
+
 /**
- * Does a full (re)build followed by a full deploy, cleaning existing files on
- * the remote server and replacing them with the full set of files pushed to
- * `dist` in the build
+ *
+ * @summary pulls theme from specified environment theme into src
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy
+ * @static
+ */
+ gulp.task("pull", gulp.series("shopify:pull:origin:src"));
+
+/**
+ * Does a full (re)build and push dist files into specified theme environment,
+ * theme using shopify theme push, by default with the --no-delete flag
+ *
+ * @summary pulls theme settings from specified environment theme into src
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy
+ * @static
+ */
+ gulp.task("pull:settings", gulp.series("generate:tmp", "shopify:pull:origin:tmp", "sync-settings:tmp:src"));
+
+
+/**
+ * Syncronizes 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
  *
  * @summary Deploy your built files to the Shopify Store set in
  *   `slate-cli.config`
@@ -75,3 +97,16 @@ gulp.task(
  * @static
  */
 gulp.task("deploy", gulp.series("sync-settings", "build", "shopify:push:dist"));
+
+/**
+ * Does a full (re)build and push dist files into specified theme environment,
+ * theme using shopify theme push, by default with the --no-delete flag
+ *
+ * @summary Deploy your built files to the Shopify Store set in
+ *   `slate-cli.config`
+ * @function deploy
+ * @memberof slate-cli.tasks.deploy:no-sync
+ * @static
+ */
+ gulp.task("deploy:no-sync", gulp.series("build", "shopify:push:dist"));
+

package/src/tasks/build-svg.js

@@ -3,8 +3,6 @@ const vinylPaths = require('vinyl-paths');
 const del = require('del');
 const size = require('gulp-size');
 const chokidar = require('chokidar');
-const svgmin = require('gulp-svgmin');
-const cheerio = require('gulp-cheerio');
 const extReplace = require('gulp-ext-replace');
 const plumber = require('gulp-plumber');
 
@@ -24,8 +22,6 @@ function processIcons(files) {
   messages.logProcessFiles('build:svg');
   return gulp.src(files)
     .pipe(plumber(utils.errorHandler))
-    .pipe(svgmin())
-    .pipe(cheerio(config.plugins.cheerio))
     .pipe(extReplace('.liquid'))
     .pipe(size({
       showFiles: true,

package/src/tasks/build-utils.js

@@ -86,6 +86,7 @@ gulp.task("generate:tmp", () => {
  * @static
  */
 gulp.task("sync-settings:tmp:src", () => {
+  messages.logProcessFiles('Syncronizing /tmp theme settings with /src')
   return copyFiles(
     themeSettingsAssets,
     { base: config.tmp.root },

package/src/tasks/includes/config.js

@@ -3,6 +3,7 @@ const logger = require("debug")("seed-tools");
 const findRoot = require("find-root");
 const tailwindcss = require("tailwindcss");
 const cssnano = require("cssnano");
+const pxtorem = require('postcss-pxtorem');
 const argv = require("minimist")(process.argv.slice(2));
 const themeRoot = findRoot(process.cwd());
 const tailwindConfig = 'tailwind.config.js'
@@ -32,6 +33,10 @@ try {
  * @memberof seed-cli
  * @summary Configuring seed-cli
  *  @prop {String} environment - development | staging | production
+ *  @prop {Boolean} optimize - whether optimize assets or not
+ *  @prop {Boolean} nodelete - run shopiy cli commands with --no-delete flag
+ *  @prop {String} tailwindConfig - tailwind config filename
+ *  @prop {String} seedConfig - seed config filename
  *  @prop {String} deployLog - path to deploy log file
  *  @prop {String} src - globs (multi-filename matching patterns) for various source files
  *  @prop {String} tmp - globs (multi-filename matching patterns) for various tmp files
@@ -42,6 +47,7 @@ try {
 const config = {
   environment: argv.environment === "undefined" ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
+  nodelete: !argv["delete"],
   themeRoot,
   packageJson: pkg,
 
@@ -49,7 +55,6 @@ const config = {
 
   seedConfig: "seed.config.js",
 
-
   src: {
     root: "src/",
     js: "src/scripts/**/*.{js,js.liquid}",
@@ -103,13 +108,19 @@ const config = {
   },
 
   plugins: {
-    cheerio: {
-      run: require("./utilities.js").processSvg,
-    },
     postcss: [
       require('postcss-import'),
       tailwindcss({ config: join(themeRoot, tailwindConfig) }),
       require('autoprefixer'),
+      pxtorem({
+        rootValue: 16,
+        unitPrecision: 5,
+        propList: ['*'],
+        selectorBlackList: [],
+        replace: true,
+        mediaQuery: true,
+        exclude: /node_modules/i
+      })
     ],
   },
 };

package/src/tasks/includes/utilities.js

@@ -65,44 +65,6 @@ const utilities = {
       .all();
   },
 
-  /**
-   * Function passed to cheerio.run - adds aria tags & other accessibility
-   * based information to each svg element's markup...
-   *
-   * @memberof seed-cli.utilities
-   * @param {Function} $ - jQuery reference
-   * @param {fs} file - reference to current icon file?
-   */
-  processSvg: ($, file) => {
-    var $svg = $("svg"); // eslint-disable-line no-var
-    var $newSvg = $(
-      '<svg aria-hidden="true" focusable="false" role="presentation" class="icon" />'
-    ); // eslint-disable-line no-var
-    var fileName = file.relative.replace(".svg", ""); // eslint-disable-line no-var
-    var viewBoxAttr = $svg.attr("viewbox"); // eslint-disable-line no-var
-
-    // Add necessary attributes
-    if (viewBoxAttr) {
-      var width = parseInt(viewBoxAttr.split(" ")[2], 10); // eslint-disable-line no-var
-      var height = parseInt(viewBoxAttr.split(" ")[3], 10); // eslint-disable-line no-var
-      var widthToHeightRatio = width / height; // eslint-disable-line no-var
-      if (widthToHeightRatio >= 1.5) {
-        $newSvg.addClass("icon--wide");
-      }
-      $newSvg.attr("viewBox", viewBoxAttr);
-    }
-
-    // Add required classes to full color icons
-    if (file.relative.indexOf("-full-color") >= 0) {
-      $newSvg.addClass("icon--full-color");
-    }
-
-    $newSvg.addClass(fileName).append($svg.contents());
-
-    $newSvg.append($svg.contents());
-    $svg.after($newSvg);
-    $svg.remove();
-  },
 
   /**
    * Factory for creating an event cache - used with a short debounce to batch any

package/src/tasks/shopify-cli.js

@@ -10,6 +10,8 @@ const {
 } = require("../utils");
 const config = require("./includes/config");
 const messages = require("./includes/messages")
+const environment = config.environment.split(/\s*,\s*|\s+/)[0];
+
 
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
@@ -40,7 +42,7 @@ gulp.task("shopify:serve:dist", () => {
 gulp.task("shopify:pull:dev", (done) => {
   messages.logChildProcess("'shopify theme pull' on development theme...");
   const devThemeId = getDevThemeID(config.themeRoot);
-  if (!devThemeId) {
+  if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
@@ -57,7 +59,7 @@ gulp.task("shopify:pull:dev", (done) => {
 gulp.task("shopify:pull:dev:tmp", (done) => {
   messages.logChildProcess("'shopify theme pull' on tmp folder...");
   const devThemeId = getDevThemeID(config.themeRoot);
-  if (!devThemeId) {
+  if (!devThemeId || devThemeId === 'false') {
     return done();
   }
 
@@ -67,6 +69,37 @@ gulp.task("shopify:pull:dev:tmp", (done) => {
   );
 });
 
+/**
+ * Pulls theme files from the seed config theme enviroment into src
+ *
+ * @function shopify:pull:dev
+ * @memberof seed-cli.tasks.deploy
+ * @static
+ */
+gulp.task("shopify:pull:origin:tmp", () => {
+  messages.logChildProcess(`'shopify theme pull ${environment}${config.nodelete ? ' --nodelete' : ''}' into tmp...`);
+  return shopifyCLI.pull(
+    getThemeID(config.themeRoot, environment),
+    config.tmp.root
+  );
+});
+
+/**
+ * Pulls theme files from the seed config theme enviroment into src
+ *
+ * @function shopify:pull:dev
+ * @memberof seed-cli.tasks.deploy
+ * @static
+ */
+gulp.task("shopify:pull:origin:src", () => {
+  messages.logChildProcess(`'shopify theme pull ${environment}${config.nodelete ? ' --nodelete' : ''}' into src...`);
+  return shopifyCLI.pull(
+    getThemeID(config.themeRoot, environment),
+    config.tmp.src,
+    config.nodelete
+  );
+});
+
 /**
  * Initiates shopify's cli command 'shopify theme push' on the dist folder,
  * pushing it to stores theme
@@ -76,8 +109,8 @@ gulp.task("shopify:pull:dev:tmp", (done) => {
  * @static
  */
 gulp.task("shopify:push:dist", () => {
-  messages.logChildProcess("'shopify theme push' on dist folder...");
-  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment));
+  messages.logChildProcess(`'shopify theme push${config.nodelete ? ' --nodelete' : ''}' on dist folder...`);
+  return shopifyCLI.push(getThemeID(config.themeRoot, config.environment), config.nodelete);
 });
 
 /**

package/src/utils.js

@@ -1,3 +1,5 @@
+import { red, yellow } from "chalk";
+import figures from "figures";
 import spawn from "cross-spawn";
 import { join } from "path";
 import { readFileSync, writeFileSync } from "fs";
@@ -16,11 +18,9 @@ export const shopifyCLI = {
    *
    * @memberof seed-cli.shopifyCLI
    * @param {string} store - store's myshopify domain name
-   * @param {boolean} async - login asynchronously
-   *
    * @returns {object} - spawnSync object or, node's <ChildProcess> object if async
    */
-  login: (store, async = false) => {
+  login: (store) => {
     const args = ["login", "--store", store];
     const options = {
       env: process.env,
@@ -28,14 +28,14 @@ export const shopifyCLI = {
       shell: true,
     };
 
-    if (async) return spawn("shopify", args, options);
-    else return spawn.sync("shopify", args, options);
+    return spawn.sync("shopify", args, options);
   },
 
   /**
    * shopify theme serve
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {object} options - node spawn options
    * @returns {object} - node's ChildProcess
    */
   serve: (options = {}) => {
@@ -52,12 +52,17 @@ export const shopifyCLI = {
    * shopify theme push
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {string} themeId - shopify theme id to pull from
+   * @param {string} dir - directory to pull into
+   * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {object} - node's ChildProcess
    */
-  pull: (themeId = null, dir = "./src") => {
+  pull: (themeId = null, dir = "./src", nodelete = true) => {
     let args = ["pull"];
     if (themeId) args = args.concat(["--themeid", themeId, dir]);
 
+    if (nodelete) args.push('--nodelete')
+
     return spawn("shopify theme", args, {
       env: process.env,
       stdio: "inherit",
@@ -69,12 +74,16 @@ export const shopifyCLI = {
    * shopify theme push
    *
    * @memberof seed-cli.shopifyCLI
+   * @param {string} themeId - shopify theme id to push into
+   * @param {boolean} [nodelete = true] - run command with --no-delete flag
    * @returns {object} - node's ChildProcess
    */
-  push: (themeId = null) => {
-    let args = ["push", "--nodelete"];
+  push: (themeId = null, nodelete = true) => {
+    let args = ["push"];
     if (themeId) args = args.concat(["--themeid", themeId]);
 
+    if (nodelete) args.push('--nodelete')
+
     return spawn("shopify theme", args, {
       cwd: config.themeRoot + "/dist",
       env: process.env,
@@ -158,3 +167,46 @@ export function setDevThemeID(themeID) {
   data[1] = `\n  __developmentThemeId: '${themeID}'` + "\n};";
   writeFileSync(config.seedConfig, data.join(config.seedConfigDelimiter));
 }
+
+
+/**
+ * Logs into seed config shopify store while logging useful messages 
+ * and handling errors.
+ * @returns {boolean} whether login was succesful or not
+ */
+export function login() {
+  const store = getStoreName(config.themeRoot);
+
+  if (!store) {
+    storeErrorMessage();
+    return false;
+  }
+  
+  console.log(`Logging into ${yellow(store)} with Shopify CLI...`)
+  const loginProcess = shopifyCLI.login(store);
+  if (loginProcess.error) {
+    console.log("");
+    console.log(
+      red(`  ${figures.cross} Failed logging into ${store}, are you sure you're using the correct account?`)
+    );
+    console.log("");
+    return false;
+  }
+
+  return true;
+}
+
+
+/**
+ * Outputs error message if there's no store field in seed config
+ */
+export function storeErrorMessage() {
+  console.log("");
+  console.log(
+    red(`  ${figures.cross} no store field in seed.config.js`)
+  );
+  console.log(
+    "    Add 'store: <store.myshopify.com>' to your project seed.config.js"
+  );
+  console.log("");
+}