@madebyseed/seed-cli-tools 1.2.0 → 1.2.1

package/lib/commands/deploy.js

@@ -16,12 +16,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 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 remove files aren't deleted.").option("-e, --env <environment>[,<environment>...]", "Shopify store(s) to deploy code to (specified in seed.config.js - default: development)", "development").option("-s, --skip-optimization", "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("-s, --skip-optimizations", "Skips asset optimization steps such as compression, minification and purging.", 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.skipOptimization) args.push("--skip-optimization");else process.env.NODE_ENV = "production";
+    if (options.skipOptimizations) args.push("--skip-optimization");else 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/gulpfile.js

@@ -1,8 +1,6 @@
 "use strict";
 
-var gulp = require("gulp"); // const argv = require('yargs').argv;
-// const runSequence = require("gulp4-run-sequence");
-// imports gulp tasks from the `tasks` directory
+var gulp = require("gulp"); // imports gulp tasks from the `tasks` directory
 
 
 require("require-directory")(module, "./tasks");

package/lib/tasks/build-css.js

@@ -12,8 +12,7 @@ var plumber = require('gulp-plumber');
 
 var chokidar = require('chokidar');
 
-var config = require('./includes/config.js'); // const utils = require('./includes/utilities.js');
-
+var config = require('./includes/config.js');
 
 var messages = require('./includes/messages.js');
 /**

package/lib/tasks/build-utils.js

@@ -2,6 +2,8 @@
 
 var gulp = require("gulp");
 
+var gulpif = require("gulp-if");
+
 var del = require("del");
 
 var zip = require("gulp-zip");
@@ -14,6 +16,8 @@ var config = require("./includes/config.js");
 
 var utils = require("./includes/utilities.js");
 
+var messages = require("./includes/messages.js");
+
 var assetsPaths = [config.src.assets, config.src.templates, config.src.sections, config.src.snippets, config.src.locales, config.src.config, config.src.layout];
 var themeSettingsAssets = [config.tmp.templates, config.tmp.config];
 /**
@@ -28,10 +32,11 @@ var themeSettingsAssets = [config.tmp.templates, config.tmp.config];
  */
 
 function copyFiles(files, srcOptions, dest) {
-  return gulp.src(files, srcOptions).pipe(plumber(utils.errorHandler)).pipe(size({
+  var log = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  return gulp.src(files, srcOptions).pipe(plumber(utils.errorHandler)).pipe(gulpif(log, size({
     showFiles: true,
     pretty: true
-  })).pipe(gulp.dest(dest));
+  }))).pipe(gulp.dest(dest));
 }
 /**
  * Clean up build dirs/files whenever doing a full/clean (re)build.
@@ -69,6 +74,7 @@ gulp.task("compress", function () {
  */
 
 gulp.task("generate:tmp", function () {
+  messages.logProcessFiles('Generating tmp folder...');
   return copyFiles(assetsPaths, {
     base: config.src.root
   }, config.tmp.root);

package/lib/tasks/includes/config.js

@@ -51,7 +51,7 @@ try {
 
 var config = {
   environment: argv.environment || "development",
-  optimize: !argv["skip-optimization"],
+  optimize: !argv["skip-optimizations"],
   themeRoot: themeRoot,
   packageJson: pkg,
   tailwindConfig: tailwindConfig,

package/lib/tasks/includes/messages.js

@@ -35,7 +35,7 @@ var messages = {
     log('running task', chalk.white('-'), chalk.cyan(processName));
   },
   logChildProcess: function logChildProcess(cmd) {
-    log('running task', chalk.bold('[child process]'), chalk.white('-'), chalk.cyan('theme', cmd));
+    log('running task', chalk.bold('[child process]'), chalk.white('-'), chalk.cyan(cmd));
   },
   logDeploys: function logDeploys(cmd, files) {
     var timestamp = "Deploy complete @ ".concat(new Date(), ". ");
@@ -56,16 +56,16 @@ var messages = {
     log('Updating JS Bundle...');
   },
   configChange: function configChange() {
-    return 'Changes to ThemeKit Config Detected: You may need to quit <slate watch>' + ' and run a full <slate deploy> as a result.';
+    return 'Changes to seed.config.js Detected: You may need to quit <seed watch>' + ' and run a full <seed deploy> as a result.';
   },
   translationsFailed: function translationsFailed() {
     return 'Translation errors detected.';
   },
   invalidThemeId: function invalidThemeId(themeId, env) {
-    log('Invalid theme id for', chalk.cyan("".concat(env, ": ").concat(themeId)), chalk.yellow('`theme_id` must be an integer or "live".'));
+    log('Invalid theme id for', chalk.cyan("".concat(env, ": ").concat(themeId)), chalk.yellow('`theme_id` must be a string.'));
   },
   configError: function configError() {
-    log('File missing:', chalk.yellow('`config.yml` does not exist. You need to add a config file before you can make changes to your Shopify store.'));
+    log('File missing:', chalk.yellow('`seed.config.js` does not exist. You need to add a config file before you can make changes to your Shopify store.'));
   },
   deployTo: function deployTo(environment) {
     log('Initiating deploy to', chalk.bold(environment));

package/lib/tasks/shopify-cli.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var gulp = require("gulp"); // const path = require("path");
-
+var gulp = require("gulp");
 
 var _require = require("../utils"),
     shopifyCLI = _require.shopifyCLI,
@@ -12,6 +11,8 @@ var _require = require("../utils"),
     getThemeID = _require.getThemeID;
 
 var config = require("./includes/config");
+
+var messages = require("./includes/messages");
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
  * watching files and uploading them to development store
@@ -23,7 +24,7 @@ var config = require("./includes/config");
 
 
 gulp.task("shopify:serve:dist", function () {
-  console.log("Running Shopify theme serve...");
+  messages.logChildProcess("'shopify theme serve' on dist...");
   var childProcess = shopifyCLI.serve({
     stdio: ["inherit", "pipe", "inherit"]
   });
@@ -41,6 +42,7 @@ gulp.task("shopify:serve:dist", function () {
  */
 
 gulp.task("shopify:pull:dev", function (done) {
+  messages.logChildProcess("'shopify theme pull' on development theme...");
   var devThemeId = getDevThemeID(config.themeRoot);
 
   if (!devThemeId) {
@@ -58,6 +60,7 @@ gulp.task("shopify:pull:dev", function (done) {
  */
 
 gulp.task("shopify:pull:dev:tmp", function (done) {
+  messages.logChildProcess("'shopify theme pull' on tmp folder...");
   var devThemeId = getDevThemeID(config.themeRoot);
 
   if (!devThemeId) {
@@ -76,6 +79,7 @@ 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));
 });
 /**

package/lib/tasks/watchers.js

@@ -6,19 +6,12 @@ var config = require("./includes/config");
 
 var chokidar = require("chokidar");
 
-var utils = require("./includes/utilities"); // const runSequence = require('gulp4-run-sequence');
-// const _ = require('lodash');
-// const debug = require('debug')('seed-tools:watchers');
-// const fs = require('fs');
-// const themekit = require('@shopify/themekit');
-// const Promise = require('bluebird');
-// const config = require('./includes/config.js');
-
+var utils = require("./includes/utilities");
 
 var messages = require("./includes/messages.js");
 
-var cache = utils.createEventCache(); // const environment = config.environment.split(/\s*,\s*|\s+/)[0];
-
+var environment = config.environment.split(/\s*,\s*|\s+/)[0];
+var cache = utils.createEventCache();
 /**
  * Aggregate task watching for file changes in `src` and
  * building/cleaning/updating `dist` accordingly.  *Made up of individual tasks
@@ -49,5 +42,6 @@ gulp.task("watch:dist", function () {
   watcher.on("all", function (event, path) {
     messages.logFileEvent(event, path);
     cache.addEvent(event, path);
+    messages.deployTo(environment);
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,6 @@
     "eslint": "^7.31.0"
   },
   "dependencies": {
-    "@shopify/themekit": "^1.1.9",
     "autoprefixer": "^10.3.1",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.1",
@@ -47,7 +46,6 @@
     "gulp-svgmin": "^4.0.1",
     "gulp-uglify": "^3.0.2",
     "gulp-zip": "^5.1.0",
-    "gulp4-run-sequence": "^1.0.1",
     "postcss": "^8.3.6",
     "require-directory": "^2.1.1",
     "sass": "^1.36.0",
@@ -55,5 +53,5 @@
     "vinyl-paths": "^3.0.1",
     "yargs": "^17.0.1"
   },
-  "gitHead": "c8014098190f878e6bd6623c69c9164a1d94001c"
+  "gitHead": "fc7df55c50463311a7eadbf0131e68c448064337"
 }

package/src/commands/deploy.js

@@ -9,15 +9,15 @@ export default 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 remove files aren't deleted."
+      "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 - default: development)",
+      "Shopify store(s) to deploy code to (specified in seed.config.js)",
       "development"
     )
     .option(
-      "-s, --skip-optimization",
+      "-s, --skip-optimizations",
       "Skips asset optimization steps such as compression, minification and purging.",
       false
     )
@@ -27,7 +27,7 @@ export default function (program) {
 
       const args = ["deploy", "--environment", options.env];
 
-      if (options.skipOptimization) args.push("--skip-optimization");
+      if (options.skipOptimizations) args.push("--skip-optimization");
       else process.env.NODE_ENV = "production";
 
       spawn(

package/src/gulpfile.js

@@ -1,6 +1,4 @@
 const gulp = require("gulp");
-// const argv = require('yargs').argv;
-// const runSequence = require("gulp4-run-sequence");
 
 // imports gulp tasks from the `tasks` directory
 require("require-directory")(module, "./tasks");

package/src/tasks/build-css.js

@@ -7,7 +7,6 @@ const chokidar = require('chokidar');
 
 
 const config = require('./includes/config.js');
-// const utils = require('./includes/utilities.js');
 const messages = require('./includes/messages.js');
 
 

package/src/tasks/build-utils.js

@@ -1,4 +1,5 @@
 const gulp = require("gulp");
+const gulpif = require("gulp-if");
 const del = require("del");
 const zip = require("gulp-zip");
 const size = require("gulp-size");
@@ -6,6 +7,7 @@ const plumber = require("gulp-plumber");
 
 const config = require("./includes/config.js");
 const utils = require("./includes/utilities.js");
+const messages = require("./includes/messages.js");
 
 const assetsPaths = [
   config.src.assets,
@@ -29,16 +31,10 @@ const themeSettingsAssets = [config.tmp.templates, config.tmp.config];
  * @returns {Stream}
  * @private
  */
-function copyFiles(files, srcOptions, dest) {
-  return gulp
-    .src(files, srcOptions)
+function copyFiles(files, srcOptions, dest, log = false) {
+  return gulp.src(files, srcOptions)
     .pipe(plumber(utils.errorHandler))
-    .pipe(
-      size({
-        showFiles: true,
-        pretty: true,
-      })
-    )
+    .pipe(gulpif(log, size({ showFiles: true, pretty: true })))
     .pipe(gulp.dest(dest));
 }
 
@@ -63,8 +59,7 @@ gulp.task("clean", () => {
 gulp.task("compress", () => {
   const distFiles = `${config.dist.root}**/*`;
 
-  return gulp
-    .src([distFiles])
+  return gulp.src([distFiles])
     .pipe(plumber(utils.errorHandler))
     .pipe(zip(`${config.packageJson.name}.zip` || "theme.zip"))
     .pipe(size({ showFiles: true, pretty: true }))
@@ -79,6 +74,7 @@ gulp.task("compress", () => {
  * @static
  */
 gulp.task("generate:tmp", () => {
+  messages.logProcessFiles('Generating tmp folder...')
   return copyFiles(assetsPaths, { base: config.src.root }, config.tmp.root);
 });
 

package/src/tasks/includes/config.js

@@ -42,7 +42,7 @@ try {
  */
 const config = {
   environment: argv.environment || "development",
-  optimize: !argv["skip-optimization"],
+  optimize: !argv["skip-optimizations"],
   themeRoot,
   packageJson: pkg,
 

package/src/tasks/includes/messages.js

@@ -52,7 +52,7 @@ const messages = {
     log('running task',
       chalk.bold('[child process]'),
       chalk.white('-'),
-      chalk.cyan('theme', cmd),
+      chalk.cyan(cmd),
     );
   },
 
@@ -80,8 +80,8 @@ const messages = {
   },
 
   configChange: () => {
-    return 'Changes to ThemeKit Config Detected: You may need to quit <slate watch>' +
-      ' and run a full <slate deploy> as a result.';
+    return 'Changes to seed.config.js Detected: You may need to quit <seed watch>' +
+      ' and run a full <seed deploy> as a result.';
   },
 
   translationsFailed: () => {
@@ -91,13 +91,13 @@ const messages = {
   invalidThemeId: (themeId, env) => {
     log('Invalid theme id for',
       chalk.cyan(`${env}: ${themeId}`),
-      chalk.yellow('`theme_id` must be an integer or "live".'),
+      chalk.yellow('`theme_id` must be a string.'),
     );
   },
 
   configError: () => {
     log('File missing:',
-      chalk.yellow('`config.yml` does not exist. You need to add a config file before you can make changes to your Shopify store.'),
+      chalk.yellow('`seed.config.js` does not exist. You need to add a config file before you can make changes to your Shopify store.'),
     );
   },
 

package/src/tasks/shopify-cli.js

@@ -1,5 +1,5 @@
 const gulp = require("gulp");
-// const path = require("path");
+
 const {
   shopifyCLI,
   extractThemeId,
@@ -9,6 +9,7 @@ const {
   getThemeID,
 } = require("../utils");
 const config = require("./includes/config");
+const messages = require("./includes/messages")
 
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
@@ -19,7 +20,7 @@ const config = require("./includes/config");
  * @static
  */
 gulp.task("shopify:serve:dist", () => {
-  console.log("Running Shopify theme serve...");
+  messages.logChildProcess("'shopify theme serve' on dist...");
   const childProcess = shopifyCLI.serve({
     stdio: ["inherit", "pipe", "inherit"],
   });
@@ -37,6 +38,7 @@ gulp.task("shopify:serve:dist", () => {
  * @static
  */
 gulp.task("shopify:pull:dev", (done) => {
+  messages.logChildProcess("'shopify theme pull' on development theme...");
   const devThemeId = getDevThemeID(config.themeRoot);
   if (!devThemeId) {
     return done();
@@ -53,6 +55,7 @@ gulp.task("shopify:pull:dev", (done) => {
  * @static
  */
 gulp.task("shopify:pull:dev:tmp", (done) => {
+  messages.logChildProcess("'shopify theme pull' on tmp folder...");
   const devThemeId = getDevThemeID(config.themeRoot);
   if (!devThemeId) {
     return done();
@@ -73,6 +76,7 @@ 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));
 });
 

package/src/tasks/watchers.js

@@ -2,18 +2,11 @@ const gulp = require("gulp");
 const config = require("./includes/config");
 const chokidar = require("chokidar");
 const utils = require("./includes/utilities");
-// const runSequence = require('gulp4-run-sequence');
-// const _ = require('lodash');
-// const debug = require('debug')('seed-tools:watchers');
-// const fs = require('fs');
-// const themekit = require('@shopify/themekit');
-// const Promise = require('bluebird');
 
-// const config = require('./includes/config.js');
 const messages = require("./includes/messages.js");
 
+const environment = config.environment.split(/\s*,\s*|\s+/)[0];
 const cache = utils.createEventCache();
-// const environment = config.environment.split(/\s*,\s*|\s+/)[0];
 
 /**
  * Aggregate task watching for file changes in `src` and
@@ -45,5 +38,6 @@ gulp.task("watch:dist", () => {
   watcher.on("all", (event, path) => {
     messages.logFileEvent(event, path);
     cache.addEvent(event, path);
+    messages.deployTo(environment);
   });
 });