@madebyseed/seed-cli-tools 1.4.1 → 1.5.0

package/lib/gulpfile.js

@@ -23,7 +23,7 @@ gulp.task("build", gulp.series("clean", gulp.parallel("build:js", "build:vendor-
  * @static
  */
 
-gulp.task("zip", gulp.series("build", "compress"));
+gulp.task("zip", gulp.series("build", "shopify:package:dist", "copy:zip"));
 /**
  * Syncronizes the development theme settings with our src folder theme settings
  *

package/lib/tasks/build-css.js

@@ -18,7 +18,7 @@ var messages = require("./includes/messages.js");
 
 var tailwindConfig = require(path.join(config.themeRoot, config.tailwindConfig));
 
-var assets = tailwindConfig.mode === "jit" ? [config.src.css, config.src.sections, config.src.layout, config.src.snippets, config.src.assets, config.src.js, config.tailwindConfig] : [config.src.css, config.tailwindConfig];
+var assets = tailwindConfig.mode === "jit" ? [config.src.css, config.src.sections, config.src.layout, config.src.snippets, config.src.assets, config.src.js, config.src.icons, config.tailwindConfig] : [config.src.css, config.tailwindConfig];
 /**
  * Concatenate css via gulp-cssimport and copys to the `/dist` folder
  *
@@ -54,7 +54,12 @@ gulp.task("watch:css", function () {
   chokidar.watch(assets, {
     ignoreInitial: true
   }).on("all", function (event, path) {
-    messages.logFileEvent(event, path);
+    var isCssFile = /.\.css$/.test(path); // Don't log event twice
+
+    if (isCssFile) {
+      messages.logFileEvent(event, path);
+    }
+
     processCss();
   });
 });

package/lib/tasks/build-utils.js

@@ -6,8 +6,6 @@ var gulpif = require("gulp-if");
 
 var del = require("del");
 
-var zip = require("gulp-zip");
-
 var size = require("gulp-size");
 
 var plumber = require("gulp-plumber");
@@ -48,22 +46,7 @@ function copyFiles(files, srcOptions, dest) {
 
 
 gulp.task("clean", function () {
-  return del(["upload", "dist", "tmp"]);
-});
-/**
- * Compress theme and build a shopify-compatible `.zip` file for uploading to store
- *
- * @function compress
- * @memberof slate-cli.tasks.deploy
- * @static
- */
-
-gulp.task("compress", function () {
-  var distFiles = "".concat(config.dist.root, "**/*");
-  return gulp.src([distFiles]).pipe(plumber(utils.errorHandler)).pipe(zip("".concat(config.packageJson.name, ".zip") || "theme.zip")).pipe(size({
-    showFiles: true,
-    pretty: true
-  })).pipe(gulp.dest("./upload/"));
+  return del(["upload", "dist", "tmp", "src/*.zip", "*.zip"]);
 });
 /**
  * Duplicates /src directory into a /tmp directory
@@ -92,4 +75,16 @@ gulp.task("sync-settings:tmp:src", function () {
   return copyFiles(themeSettingsAssets, {
     base: config.tmp.root
   }, config.src.root);
+});
+/**
+ * Copies zip from dist to src
+ * @function copy:zip
+ * @memberof seed-cli.tasks.sync-settings
+ * @static
+ */
+
+gulp.task("copy:zip", function () {
+  return copyFiles(config.dist.zip, {
+    base: config.dist.root
+  }, config.themeRoot, true);
 });

package/lib/tasks/includes/config.js

@@ -54,7 +54,7 @@ try {
 
 
 var config = {
-  environment: argv.environment === "undefined" ? "development" : argv.environment,
+  environment: argv.environment === "undefined" || !argv.environment ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
   nodelete: !argv["delete"],
   themeRoot: themeRoot,
@@ -77,7 +77,8 @@ var config = {
     sections: "src/sections/*",
     locales: "src/locales/*",
     config: "src/config/*",
-    layout: "src/layout/*"
+    layout: "src/layout/*",
+    zip: "src/**/*.zip"
   },
   tmp: {
     root: "tmp/",
@@ -94,7 +95,8 @@ var config = {
     sections: "tmp/sections/*",
     locales: "tmp/locales/*",
     config: "tmp/config/*",
-    layout: "tmp/layout/*"
+    layout: "tmp/layout/*",
+    zip: "tmp/**/*.zip"
   },
   dist: {
     root: "dist/",
@@ -103,7 +105,8 @@ var config = {
     sections: "dist/sections/",
     layout: "dist/layout/",
     templates: "dist/templates/",
-    locales: "dist/locales/"
+    locales: "dist/locales/",
+    zip: "dist/*.zip"
   },
   roots: {
     js: "src/scripts/*.{js,js.liquid}",

package/lib/tasks/shopify-cli.js

@@ -14,6 +14,7 @@ var config = require("./includes/config");
 
 var messages = require("./includes/messages");
 
+console.log(config);
 var environment = config.environment.split(/\s*,\s*|\s+/)[0];
 /**
  * Initiates shopify's cli command 'shopify theme serve' on the dist folder,
@@ -107,6 +108,18 @@ 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), config.nodelete);
 });
+/**
+ * Initiates 'shopify theme package' on the dist folder, creating a zip.
+ * 
+ * @function shopify:package:dist 
+ * @memberof seed-cli.tasks.zip 
+ * @static 
+ */
+
+gulp.task("shopify:package:dist", function () {
+  messages.logChildProcess("shopify theme package on dist folder...");
+  return shopifyCLI["package"]();
+});
 /**
  * Takes the output of shopify cli serve, extracts dev theme ID and persists
  * in seed.config.js

package/lib/utils.js

@@ -105,7 +105,7 @@ var shopifyCLI = {
    * @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
+   * @returns {ChildProcess} - node's ChildProcess
    */
   push: function push() {
     var themeId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
@@ -119,6 +119,21 @@ var shopifyCLI = {
       stdio: "inherit",
       shell: true
     });
+  },
+
+  /**
+   * shopify theme package
+   * 
+   * @memberof seed-cli.shopifyCLI
+   * @returns {ChildProcess} 
+   */
+  "package": function _package() {
+    return (0, _crossSpawn["default"])("shopify theme", ["package"], {
+      cwd: _config["default"].themeRoot + "/dist",
+      env: process.env,
+      stdio: "inherit",
+      shell: true
+    });
   }
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -42,7 +42,6 @@
     "gulp-sass": "^5.0.0",
     "gulp-size": "^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",
@@ -52,5 +51,5 @@
     "vinyl-paths": "^3.0.1",
     "yargs": "^17.0.1"
   },
-  "gitHead": "5ffec2a6cdf2a839f84799d0d6784cf882b6ddb1"
+  "gitHead": "f2f4b486718b60c024221276f6f52c7435ea2c87"
 }

package/src/gulpfile.js

@@ -32,7 +32,7 @@ gulp.task(
  * @memberof slate-cli.tasks
  * @static
  */
-gulp.task("zip", gulp.series("build", "compress"));
+gulp.task("zip", gulp.series("build", "shopify:package:dist", "copy:zip"));
 
 /**
  * Syncronizes the development theme settings with our src folder theme settings

package/src/tasks/build-css.js

@@ -21,6 +21,7 @@ const assets =
         config.src.snippets,
         config.src.assets,
         config.src.js,
+        config.src.icons,
         config.tailwindConfig,
       ]
     : [config.src.css, config.tailwindConfig];
@@ -61,7 +62,12 @@ gulp.task("build:css", () => {
  */
 gulp.task("watch:css", () => {
   chokidar.watch(assets, { ignoreInitial: true }).on("all", (event, path) => {
-    messages.logFileEvent(event, path);
+    const isCssFile = /.\.css$/.test(path); 
+    // Don't log event twice
+    if (isCssFile) {
+      messages.logFileEvent(event, path);
+    }
+
     processCss();
   });
 });

package/src/tasks/build-utils.js

@@ -1,7 +1,6 @@
 const gulp = require("gulp");
 const gulpif = require("gulp-if");
 const del = require("del");
-const zip = require("gulp-zip");
 const size = require("gulp-size");
 const plumber = require("gulp-plumber");
 
@@ -46,24 +45,7 @@ function copyFiles(files, srcOptions, dest, log = false) {
  * @static
  */
 gulp.task("clean", () => {
-  return del(["upload", "dist", "tmp"]);
-});
-
-/**
- * Compress theme and build a shopify-compatible `.zip` file for uploading to store
- *
- * @function compress
- * @memberof slate-cli.tasks.deploy
- * @static
- */
-gulp.task("compress", () => {
-  const distFiles = `${config.dist.root}**/*`;
-
-  return gulp.src([distFiles])
-    .pipe(plumber(utils.errorHandler))
-    .pipe(zip(`${config.packageJson.name}.zip` || "theme.zip"))
-    .pipe(size({ showFiles: true, pretty: true }))
-    .pipe(gulp.dest("./upload/"));
+  return del(["upload", "dist", "tmp", "src/*.zip", "*.zip"]);
 });
 
 /**
@@ -93,3 +75,18 @@ gulp.task("sync-settings:tmp:src", () => {
     config.src.root
   );
 });
+
+/**
+ * Copies zip from dist to src
+ * @function copy:zip
+ * @memberof seed-cli.tasks.sync-settings
+ * @static
+ */
+gulp.task("copy:zip", () => {
+  return copyFiles(
+    config.dist.zip,
+    { base: config.dist.root },
+    config.themeRoot,
+    true
+  )
+})

package/src/tasks/includes/config.js

@@ -45,7 +45,7 @@ try {
  *  @prop {Object} plugins - configuration objects passed to various plugins used in the task interface
  */
 const config = {
-  environment: argv.environment === "undefined" ? "development" : argv.environment,
+  environment: (argv.environment === "undefined" || !argv.environment) ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
   nodelete: !argv["delete"],
   themeRoot,
@@ -73,6 +73,7 @@ const config = {
     locales: "src/locales/*",
     config: "src/config/*",
     layout: "src/layout/*",
+    zip: "src/**/*.zip"
   },
 
   tmp: {
@@ -91,6 +92,7 @@ const config = {
     locales: "tmp/locales/*",
     config: "tmp/config/*",
     layout: "tmp/layout/*",
+    zip: "tmp/**/*.zip"
   },
 
   dist: {
@@ -101,6 +103,7 @@ const config = {
     layout: "dist/layout/",
     templates: "dist/templates/",
     locales: "dist/locales/",
+    zip: "dist/*.zip"
   },
 
   roots: {

package/src/tasks/shopify-cli.js

@@ -10,6 +10,7 @@ const {
 } = require("../utils");
 const config = require("./includes/config");
 const messages = require("./includes/messages")
+console.log(config);
 const environment = config.environment.split(/\s*,\s*|\s+/)[0];
 
 
@@ -113,6 +114,18 @@ gulp.task("shopify:push:dist", () => {
   return shopifyCLI.push(getThemeID(config.themeRoot, config.environment), config.nodelete);
 });
 
+/**
+ * Initiates 'shopify theme package' on the dist folder, creating a zip.
+ * 
+ * @function shopify:package:dist 
+ * @memberof seed-cli.tasks.zip 
+ * @static 
+ */
+gulp.task("shopify:package:dist", () => {
+  messages.logChildProcess("shopify theme package on dist folder...")
+  return shopifyCLI.package();
+})
+
 /**
  * Takes the output of shopify cli serve, extracts dev theme ID and persists
  * in seed.config.js

package/src/utils.js

@@ -76,7 +76,7 @@ export const shopifyCLI = {
    * @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
+   * @returns {ChildProcess} - node's ChildProcess
    */
   push: (themeId = null, nodelete = true) => {
     let args = ["push"];
@@ -91,6 +91,21 @@ export const shopifyCLI = {
       shell: true,
     });
   },
+
+  /**
+   * shopify theme package
+   * 
+   * @memberof seed-cli.shopifyCLI
+   * @returns {ChildProcess} 
+   */
+  package: () => {
+    return spawn("shopify theme", ["package"], {
+      cwd: config.themeRoot + "/dist",
+      env: process.env,
+      stdio: "inherit",
+      shell: true,
+    });
+  }
 };
 
 /**