@madebyseed/seed-cli-tools 2.2.1 → 2.3.1

package/lib/commands/watch.js

@@ -16,18 +16,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var logger = (0, _debug["default"])("seed-tools:watch");
 
 function _default(program) {
-  program.command("watch").alias("w").description("Watches files for code changes and immediately deploys updates to dev theme as they occur. " + "This uses shopify theme serve under the hood.").option("-s, --store <store>", "Used for multi-store projects, specify the store to run the watch command for.", false).option("-o, --optimize", "Optimizes assets by compressing, minifying and purging.", false).action(function () {
+  program.command("watch").alias("w").description("Watches files for code changes and immediately deploys updates to dev theme as they occur. " + "This uses shopify theme serve under the hood.").option("-s, --store <store>", "Used for multi-store projects, specify the store to run the watch command for.", false).option("-sp, --store-password <password>", "Used for store password protected stores.", false).option("-o, --optimize", "Optimizes assets by compressing, minifying 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 gulpArgs = ["watch", "--gulpfile", _config["default"].gulpFile, "--cwd", _config["default"].themeRoot, "--environment", options.env];
-    if (!options.optimize) gulpArgs.push("--skip-optimizations");
 
     if (options.store) {
       gulpArgs.push("--store");
       gulpArgs.push(options.store);
     }
 
+    if (options.storePassword) {
+      gulpArgs.push("--store-password");
+      gulpArgs.push(options.storePassword);
+    }
+
+    if (!options.optimize) gulpArgs.push("--skip-optimizations");
     process.env.NODE_ENV = options.optimize ? "production" : "development";
     (0, _crossSpawn["default"])(_config["default"].gulp, gulpArgs, {
       detached: false,

package/lib/tasks/build-css.js

@@ -12,6 +12,11 @@ var plumber = require("gulp-plumber");
 
 var chokidar = require("chokidar");
 
+var _require = require("glob"),
+    glob = _require.glob;
+
+var fs = require("fs");
+
 var config = require("./includes/config.js");
 
 var messages = require("./includes/messages.js");
@@ -51,6 +56,25 @@ function processSass() {
     }).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets)).on('finish', resolve).on('error', reject);
   });
 }
+/**
+* Touch CSS files to update their modification time
+* This ensures Shopify's watcher detects the changes
+*/
+
+
+function touchCssFiles() {
+  try {
+    var cssFiles = glob.sync("".concat(config.dist.assets, "*.css"));
+    cssFiles.forEach(function (file) {
+      // Update the file modification time to trigger Shopify's watcher
+      var now = new Date();
+      fs.utimesSync(file, now, now);
+      messages.logFileEvent("touch", file);
+    });
+  } catch (error) {
+    console.error("Error touching CSS files:", error);
+  }
+}
 /**
  * Concatenate css via gulp-cssimport
  *
@@ -82,6 +106,10 @@ gulp.task("watch:css", function () {
       messages.logFileEvent(event, path);
     }
 
-    processCss();
+    processCss(); // Important: Touch CSS files after processing to ensure Shopify detects changes
+
+    setTimeout(function () {
+      touchCssFiles();
+    }, 500);
   });
 });

package/lib/tasks/build-js.js

@@ -16,6 +16,11 @@ var chokidar = require('chokidar');
 
 var minify = composer(uglifyjs, console);
 
+var _require = require("glob"),
+    glob = _require.glob;
+
+var fs = require("fs");
+
 var utils = require("./includes/utilities");
 
 var config = require('./includes/config.js');
@@ -40,6 +45,25 @@ function processVendorJs() {
     compress: true
   })).pipe(gulp.dest(config.dist.assets));
 }
+/**
+ * Touch JS files to update their modification time
+ * This ensures Shopify's watcher detects the changes
+ */
+
+
+function touchJsFiles() {
+  try {
+    var jsFiles = glob.sync("".concat(config.dist.assets, "*.js"));
+    jsFiles.forEach(function (file) {
+      // Update the file modification time to trigger Shopify's watcher
+      var now = new Date();
+      fs.utimesSync(file, now, now);
+      messages.logFileEvent("touch", file);
+    });
+  } catch (error) {
+    console.error("Error touching JS files:", error);
+  }
+}
 
 gulp.task('build:js', function () {
   return processThemeJs();
@@ -49,7 +73,12 @@ gulp.task('watch:js', function () {
     ignoreInitial: true
   }).on('all', function (event, path) {
     messages.logFileEvent(event, path);
-    processThemeJs();
+    processThemeJs().then(function () {
+      // Touch JS files after processing to ensure Shopify detects changes
+      setTimeout(function () {
+        touchJsFiles();
+      }, 500);
+    });
   });
 });
 gulp.task('build:vendor-js', function () {
@@ -60,6 +89,11 @@ gulp.task('watch:vendor-js', function () {
     ignoreInitial: true
   }).on('all', function (event, path) {
     messages.logFileEvent(event, path);
-    processVendorJs();
+    processVendorJs().then(function () {
+      // Touch JS files after processing to ensure Shopify detects changes
+      setTimeout(function () {
+        touchJsFiles();
+      }, 500);
+    });
   });
 });

package/lib/tasks/includes/config.js

@@ -52,6 +52,7 @@ try {
 var config = {
   environment: argv.environment === "undefined" || !argv.environment ? "development" : argv.environment,
   store: argv.store === "undefined" || !argv.store ? null : argv.store,
+  storePassword: argv['store-password'] === "undefined" || !argv['store-password'] ? null : argv['store-password'],
   optimize: !argv["skip-optimizations"],
   nodelete: !argv["delete"],
   themeRoot: themeRoot,

package/lib/tasks/shopify-cli.js

@@ -17,6 +17,7 @@ var messages = require("./includes/messages");
 
 var environment = config.environment.split(/\s*,\s*|\s+/)[0];
 var store = config.store;
+var storePassword = config.storePassword;
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
  * watching files and uploading them to development store
@@ -28,7 +29,7 @@ var store = config.store;
 
 gulp.task("shopify:serve:dist", function () {
   var domain = getStoreName(config.themeRoot, store);
-  messages.logChildProcess("'shopify theme dev --store ".concat(domain, "' on dist..."));
+  messages.logChildProcess("'shopify theme dev --store ".concat(domain).concat(storePassword ? " --store-password ".concat(storePassword) : '', "'  on dist..."));
   var childProcess = shopifyCLI.serve(domain, {
     stdio: ["inherit", "pipe", "inherit"]
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "2.2.1",
+  "version": "2.3.1",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -34,6 +34,7 @@
     "fancy-log": "^1.3.3",
     "figures": "^3.2.0",
     "find-root": "^1.1.0",
+    "glob": "^11.0.2",
     "gulp": "^4.0.2",
     "gulp-ext-replace": "^0.3.0",
     "gulp-if": "^3.0.0",
@@ -57,5 +58,5 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "bf1fc8efec7921816461f48b7c8f5fae70bb6a64"
+  "gitHead": "018f1210f603f30c38dfb6cc17eb66967072e3b3"
 }

package/src/commands/watch.js

@@ -17,6 +17,11 @@ export default function (program) {
       "Used for multi-store projects, specify the store to run the watch command for.",
       false
     )
+    .option(
+      "-sp, --store-password <password>",
+      "Used for store password protected stores.",
+      false
+    )
     .option(
       "-o, --optimize",
       "Optimizes assets by compressing, minifying and purging.",
@@ -36,13 +41,19 @@ export default function (program) {
         options.env,
       ];
 
-      if (!options.optimize) gulpArgs.push("--skip-optimizations");
 
       if (options.store) {
         gulpArgs.push("--store");
         gulpArgs.push(options.store);
       }
 
+      if (options.storePassword) {
+        gulpArgs.push("--store-password");
+        gulpArgs.push(options.storePassword);
+      }
+
+      if (!options.optimize) gulpArgs.push("--skip-optimizations");
+
       process.env.NODE_ENV = options.optimize ? "production" : "development";
 
       spawn(config.gulp, gulpArgs, {

package/src/tasks/build-css.js

@@ -4,7 +4,8 @@ const sass = require("gulp-sass")(require("sass"));
 const postcss = require("gulp-postcss");
 const plumber = require("gulp-plumber");
 const chokidar = require("chokidar");
-
+const { glob } = require("glob");
+const fs = require("fs");
 const config = require("./includes/config.js");
 const messages = require("./includes/messages.js");
 const utils = require("./includes/utilities");
@@ -67,6 +68,24 @@ function processCss() {
     .on('error', reject)
   })
 
+ }
+
+ /**
+ * Touch CSS files to update their modification time
+ * This ensures Shopify's watcher detects the changes
+ */
+function touchCssFiles() {
+  try {
+    const cssFiles = glob.sync(`${config.dist.assets}*.css`);
+    cssFiles.forEach((file) => {
+      // Update the file modification time to trigger Shopify's watcher
+      const now = new Date();
+      fs.utimesSync(file, now, now);
+      messages.logFileEvent("touch", file);
+    });
+  } catch (error) {
+    console.error(`Error touching CSS files:`, error);
+  }
 }
 
 /**
@@ -98,5 +117,10 @@ gulp.task("watch:css", () => {
     }
 
     processCss();
+
+    // Important: Touch CSS files after processing to ensure Shopify detects changes
+    setTimeout(() => {
+      touchCssFiles();
+    }, 500);
   });
 });

package/src/tasks/build-js.js

@@ -6,8 +6,8 @@ const include = require('gulp-include');
 const plumber = require('gulp-plumber');
 const chokidar = require('chokidar');
 const minify = composer(uglifyjs, console)
-
-
+const { glob } = require("glob");
+const fs = require("fs");
 const utils = require("./includes/utilities");
 const config = require('./includes/config.js');
 const messages = require('./includes/messages.js');
@@ -34,6 +34,24 @@ function processVendorJs() {
     .pipe(gulp.dest(config.dist.assets));
 }
 
+/**
+ * Touch JS files to update their modification time
+ * This ensures Shopify's watcher detects the changes
+ */
+function touchJsFiles() {
+  try {
+    const jsFiles = glob.sync(`${config.dist.assets}*.js`);
+    jsFiles.forEach((file) => {
+      // Update the file modification time to trigger Shopify's watcher
+      const now = new Date();
+      fs.utimesSync(file, now, now);
+      messages.logFileEvent("touch", file);
+    });
+  } catch (error) {
+    console.error(`Error touching JS files:`, error);
+  }
+}
+
 gulp.task('build:js', () => {
   return processThemeJs();
 });
@@ -42,7 +60,12 @@ gulp.task('watch:js', () => {
   chokidar.watch([config.src.js, `!${config.roots.vendorJs}`, `!${config.src.vendorJs}`], {ignoreInitial: true})
     .on('all', (event, path) => {
       messages.logFileEvent(event, path);
-      processThemeJs()
+      processThemeJs().then(() => {
+         // Touch JS files after processing to ensure Shopify detects changes
+        setTimeout(() => {
+          touchJsFiles();
+        }, 500);
+      });
     });
 });
 
@@ -54,6 +77,11 @@ gulp.task('watch:vendor-js', () => {
   chokidar.watch([config.roots.vendorJs, config.src.vendorJs], {ignoreInitial: true})
     .on('all', (event, path) => {
       messages.logFileEvent(event, path);
-      processVendorJs();
+      processVendorJs().then(() => {
+        // Touch JS files after processing to ensure Shopify detects changes
+        setTimeout(() => {
+          touchJsFiles();
+        }, 500);
+      });
     });
 });

package/src/tasks/includes/config.js

@@ -40,6 +40,7 @@ try {
 const config = {
   environment: (argv.environment === "undefined" || !argv.environment) ? "development" : argv.environment,
   store: (argv.store === "undefined" || !argv.store) ? null : argv.store,
+  storePassword: (argv['store-password'] === "undefined" || !argv['store-password']) ? null : argv['store-password'],
   optimize: !argv["skip-optimizations"],
   nodelete: !argv["delete"],
   themeRoot,

package/src/tasks/shopify-cli.js

@@ -13,6 +13,7 @@ const config = require("./includes/config");
 const messages = require("./includes/messages")
 const environment = config.environment.split(/\s*,\s*|\s+/)[0];
 const store = config.store;
+const storePassword = config.storePassword;
 
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
@@ -24,7 +25,7 @@ const store = config.store;
  */
 gulp.task("shopify:serve:dist", () => {
   const domain = getStoreName(config.themeRoot, store);
-  messages.logChildProcess(`'shopify theme dev --store ${domain}' on dist...`);
+  messages.logChildProcess(`'shopify theme dev --store ${domain}${storePassword ? ` --store-password ${storePassword}` : ''}'  on dist...`);
   const childProcess = shopifyCLI.serve(domain, {
     stdio: ["inherit", "pipe", "inherit"],
   });