@madebyseed/seed-cli-tools 2.2.0 → 2.3.0

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-js.js

@@ -16,10 +16,6 @@ var chokidar = require('chokidar');
 
 var minify = composer(uglifyjs, console);
 
-var gulpWebpack = require('webpack-stream');
-
-var webpack = require('webpack');
-
 var utils = require("./includes/utilities");
 
 var config = require('./includes/config.js');
@@ -30,7 +26,9 @@ function processThemeJs() {
   messages.logProcessFiles('build:js');
   return gulp.src([config.roots.js, "!".concat(config.roots.vendorJs)], {
     allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(gulpif(config.usesModuleBundler, gulpWebpack(config.plugins.webpack, webpack), include())).pipe(gulpif(config.optimize && !config.usesModuleBundler, minify())).pipe(gulp.dest(config.dist.assets));
+  }).pipe(plumber(utils.errorHandler)).pipe(include({
+    separateInputs: true
+  })).pipe(gulpif(config.optimize && !config.usesModuleBundler, minify())).pipe(gulp.dest(config.dist.assets));
 }
 
 function processVendorJs() {

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.0",
+  "version": "2.3.0",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -8,6 +8,7 @@
     "start": "npm run clean && babel -w -d lib/ src/",
     "test": "npm run lint",
     "prepublish": "npm test && npm run clean && babel -d lib/ src/",
+    "dev": "npm run prepublish && npm link",
     "lint": "eslint --max-warnings 0 src/",
     "lint-allow-warning": "eslint src/"
   },
@@ -56,5 +57,5 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "533a09375f52663debed2398bb22cac2788eb790"
+  "gitHead": "b238f65d36559b8b10670bc8840c24c853b497f9"
 }

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-js.js

@@ -6,8 +6,7 @@ const include = require('gulp-include');
 const plumber = require('gulp-plumber');
 const chokidar = require('chokidar');
 const minify = composer(uglifyjs, console)
-const gulpWebpack = require('webpack-stream');
-const webpack = require('webpack');
+
 
 const utils = require("./includes/utilities");
 const config = require('./includes/config.js');
@@ -15,9 +14,10 @@ const messages = require('./includes/messages.js');
 
 function processThemeJs() {
   messages.logProcessFiles('build:js');
+
   return gulp.src([config.roots.js, `!${config.roots.vendorJs}`], { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
-    .pipe(gulpif(config.usesModuleBundler, gulpWebpack(config.plugins.webpack, webpack), include()))
+    .pipe(include({ separateInputs: true }))
     .pipe(gulpif(config.optimize && !config.usesModuleBundler, minify()))
     .pipe(gulp.dest(config.dist.assets))
 }

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"],
   });