@madebyseed/seed-cli-tools 1.5.0 → 1.6.0

package/lib/config.js

@@ -18,7 +18,7 @@ var currentDirectory = __dirname;
 var themeRoot = (0, _findRoot["default"])(workingDirectory);
 var defaultGulpPath = (0, _path.join)(themeRoot, (0, _path.normalize)("node_modules/.bin/gulp")); // Legacy path for older versions of Node.
 
-var legacyGulpPath = (0, _path.join)(themeRoot, (0, _path.normalize)("node_modules/seed-cli-tools/node_modules/.bin/gulp"));
+var legacyGulpPath = (0, _path.join)(themeRoot, (0, _path.normalize)("node_modules/@madebyseed/seed-cli-tools/node_modules/.bin/gulp"));
 var config = {
   gulpFile: (0, _path.join)(currentDirectory, "gulpfile.js"),
   gulp: (0, _fs.existsSync)(defaultGulpPath) ? defaultGulpPath : legacyGulpPath,

package/lib/tasks/build-css.js

@@ -16,9 +16,11 @@ var config = require("./includes/config.js");
 
 var messages = require("./includes/messages.js");
 
-var tailwindConfig = require(path.join(config.themeRoot, config.tailwindConfig));
+var _require = require("./includes/config.js"),
+    usesTailwind = _require.usesTailwind;
 
-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];
+var tailwindConfig = config.usesTailwind ? require(path.join(config.themeRoot, config.tailwindConfig)) : {};
+var assets = config.usesTailwind || 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
  *
@@ -28,7 +30,11 @@ var assets = tailwindConfig.mode === "jit" ? [config.src.css, config.src.section
  */
 
 function processCss() {
-  return gulp.src(config.roots.css).pipe(plumber()).pipe(postcss(config.plugins.postcss)).pipe(sass().on("error", sass.logError)).pipe(gulp.dest(config.dist.assets));
+  if (usesTailwind) {
+    return gulp.src(config.roots.css).pipe(plumber()).pipe(postcss(config.plugins.postcss)).pipe(sass().on("error", sass.logError)).pipe(gulp.dest(config.dist.assets));
+  } else {
+    return gulp.src(config.roots.css).pipe(plumber()).pipe(sass().on("error", sass.logError)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
+  }
 }
 /**
  * Concatenate css via gulp-cssimport

package/lib/tasks/includes/config.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var fs = require('fs');
+
 var join = require("path").join;
 
 var logger = require("debug")("seed-tools");
@@ -60,6 +62,7 @@ var config = {
   themeRoot: themeRoot,
   packageJson: pkg,
   tailwindConfig: tailwindConfig,
+  usesTailwind: fs.existsSync(join(themeRoot, tailwindConfig)),
   seedConfig: "seed.config.js",
   shopifyIgnore: join(themeRoot, '.shopifyignore'),
   src: {
@@ -113,25 +116,34 @@ var config = {
     vendorJs: "src/scripts/vendor.js",
     css: "src/styles/*.{css,scss}"
   },
+  // Added at runtime
   plugins: {
-    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
-    })]
+    postcss: []
   }
 };
 
+if (config.usesTailwind) {
+  config.plugins.postcss.push(require('postcss-import'));
+  config.plugins.postcss.push(tailwindcss({
+    config: join(themeRoot, tailwindConfig)
+  }));
+}
+
+config.plugins.postcss.push(require('autoprefixer'));
+
 if (config.optimize) {
   config.plugins.postcss.push(cssnano({
     preset: "default"
   }));
 }
 
+config.plugins.postcss.push(pxtorem({
+  rootValue: 16,
+  unitPrecision: 5,
+  propList: ['*'],
+  selectorBlackList: [],
+  replace: true,
+  mediaQuery: true,
+  exclude: /node_modules/i
+}));
 module.exports = config;

package/lib/tasks/shopify-cli.js

@@ -14,7 +14,6 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -51,5 +51,5 @@
     "vinyl-paths": "^3.0.1",
     "yargs": "^17.0.1"
   },
-  "gitHead": "f2f4b486718b60c024221276f6f52c7435ea2c87"
+  "gitHead": "426187d1c16859249db56a7174a94192adc9d702"
 }

package/src/config.js

@@ -11,7 +11,7 @@ const defaultGulpPath = join(themeRoot, normalize("node_modules/.bin/gulp"));
 // Legacy path for older versions of Node.
 const legacyGulpPath = join(
   themeRoot,
-  normalize("node_modules/seed-cli-tools/node_modules/.bin/gulp")
+  normalize("node_modules/@madebyseed/seed-cli-tools/node_modules/.bin/gulp")
 );
 
 const config = {

package/src/tasks/build-css.js

@@ -7,13 +7,14 @@ const chokidar = require("chokidar");
 
 const config = require("./includes/config.js");
 const messages = require("./includes/messages.js");
-const tailwindConfig = require(path.join(
+const { usesTailwind } = require("./includes/config.js");
+const tailwindConfig = config.usesTailwind ? require(path.join(
   config.themeRoot,
   config.tailwindConfig
-));
+)) : {};
 
-const assets =
-  tailwindConfig.mode === "jit"
+const assets = 
+  config.usesTailwind || tailwindConfig.mode === "jit"
     ? [
         config.src.css,
         config.src.sections,
@@ -34,12 +35,22 @@ const assets =
  * @private
  */
 function processCss() {
-  return gulp
-    .src(config.roots.css)
-    .pipe(plumber())
-    .pipe(postcss(config.plugins.postcss))
-    .pipe(sass().on("error", sass.logError))
-    .pipe(gulp.dest(config.dist.assets));
+  if (usesTailwind)  {
+    return gulp
+      .src(config.roots.css)
+      .pipe(plumber())
+      .pipe(postcss(config.plugins.postcss))
+      .pipe(sass().on("error", sass.logError))
+      .pipe(gulp.dest(config.dist.assets));
+  } else {
+    return gulp
+      .src(config.roots.css)
+      .pipe(plumber())
+      .pipe(sass().on("error", sass.logError))
+      .pipe(postcss(config.plugins.postcss))
+      .pipe(gulp.dest(config.dist.assets));
+  }
+
 }
 
 /**

package/src/tasks/includes/config.js

@@ -1,3 +1,4 @@
+const fs = require('fs');
 const join = require("path").join;
 const logger = require("debug")("seed-tools");
 const findRoot = require("find-root");
@@ -53,6 +54,8 @@ const config = {
 
   tailwindConfig,
 
+  usesTailwind: fs.existsSync(join(themeRoot, tailwindConfig)),
+
   seedConfig: "seed.config.js",
 
   shopifyIgnore: join(themeRoot, '.shopifyignore'),
@@ -112,26 +115,32 @@ const config = {
     css: "src/styles/*.{css,scss}",
   },
 
+  // Added at runtime
   plugins: {
-    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
-      })
-    ],
+    postcss: [],
   },
 };
 
+
+if (config.usesTailwind) {
+  config.plugins.postcss.push(require('postcss-import'))
+  config.plugins.postcss.push(tailwindcss({ config: join(themeRoot, tailwindConfig) }))
+}
+
+config.plugins.postcss.push(require('autoprefixer'))
+
 if (config.optimize) {
   config.plugins.postcss.push((cssnano({ preset: "default" })))
 }
 
+config.plugins.postcss.push(pxtorem({
+  rootValue: 16,
+  unitPrecision: 5,
+  propList: ['*'],
+  selectorBlackList: [],
+  replace: true,
+  mediaQuery: true,
+  exclude: /node_modules/i
+}))
+
 module.exports = config;

package/src/tasks/shopify-cli.js

@@ -10,7 +10,6 @@ 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];