@madebyseed/seed-cli-tools 1.9.2 → 1.9.4

package/lib/tasks/build-css.js

@@ -19,7 +19,7 @@ var messages = require("./includes/messages.js");
 var utils = require("./includes/utilities");
 
 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];
+var assets = config.usesTailwind || tailwindConfig.mode === "jit" ? [config.src.css, config.src.scss, config.src.sections, config.src.layout, config.src.snippets, config.src.assets, config.src.templates, config.src.js, config.src.icons, config.tailwindConfig] : [config.src.css, config.src.scss, config.tailwindConfig];
 /**
  * Process css and tailwind
  *
@@ -29,9 +29,11 @@ var assets = config.usesTailwind || tailwindConfig.mode === "jit" ? [config.src.
  */
 
 function processCss() {
-  return gulp.src(config.roots.css, {
-    allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
+  return new Promise(function (resolve, reject) {
+    gulp.src(config.roots.css, {
+      allowEmpty: true
+    }).pipe(plumber(utils.errorHandler)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets)).on('finish', resolve).on('error', reject);
+  });
 }
 /**
  * Process sass files
@@ -43,9 +45,11 @@ function processCss() {
 
 
 function processSass() {
-  return gulp.src(config.roots.scss, {
-    allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
+  return new Promise(function (resolve, reject) {
+    gulp.src(config.roots.scss, {
+      allowEmpty: true
+    }).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets)).on('finish', resolve).on('error', reject);
+  });
 }
 /**
  * Concatenate css via gulp-cssimport

package/lib/tasks/includes/config.js

@@ -144,13 +144,6 @@ if (config.usesTailwind) {
 }
 
 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,
@@ -160,6 +153,13 @@ config.plugins.postcss.push(pxtorem({
   mediaQuery: true,
   exclude: /node_modules/i
 }));
+
+if (config.optimize) {
+  config.plugins.postcss.push(cssnano({
+    preset: "default"
+  }));
+}
+
 config.plugins.postcss.push(reporter({
   clearReportedMessages: true
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -56,5 +56,5 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "7f8ebcb2b58202035fb018997a689463acc0b4a7"
+  "gitHead": "c48c747d439cfff485b3589a7e48e25c41c32648"
 }

package/src/tasks/build-css.js

@@ -18,15 +18,17 @@ const assets =
   config.usesTailwind || tailwindConfig.mode === "jit"
     ? [
         config.src.css,
+        config.src.scss,
         config.src.sections,
         config.src.layout,
         config.src.snippets,
         config.src.assets,
+        config.src.templates,
         config.src.js,
         config.src.icons,
         config.tailwindConfig,
       ]
-    : [config.src.css, config.tailwindConfig];
+    : [config.src.css, config.src.scss, config.tailwindConfig];
 
 /**
  * Process css and tailwind
@@ -36,10 +38,15 @@ const assets =
  * @private
  */
 function processCss() {
-  return gulp.src(config.roots.css, { allowEmpty: true })
+  return new Promise((resolve, reject) => {
+    gulp.src(config.roots.css, { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
     .pipe(postcss(config.plugins.postcss))
     .pipe(gulp.dest(config.dist.assets))
+    .on('finish', resolve)
+    .on('error', reject)
+  })
+
 }
 
 /**
@@ -50,11 +57,16 @@ function processCss() {
  * @private
  */
  function processSass() {
-  return gulp.src(config.roots.scss, { allowEmpty: true })
+  return new Promise((resolve, reject) => {
+    gulp.src(config.roots.scss, { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
     .pipe(sass())
     .pipe(postcss(config.plugins.postcss))
     .pipe(gulp.dest(config.dist.assets))
+    .on('finish', resolve)
+    .on('error', reject)
+  })
+
 }
 
 /**

package/src/tasks/includes/config.js

@@ -147,10 +147,6 @@ if (config.usesTailwind) {
 
 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,
@@ -161,6 +157,10 @@ config.plugins.postcss.push(pxtorem({
   exclude: /node_modules/i
 }))
 
+if (config.optimize) {
+  config.plugins.postcss.push((cssnano({ preset: "default" })))
+}
+
 config.plugins.postcss.push(reporter({ clearReportedMessages: true }))
 
 module.exports = config;