@madebyseed/seed-cli-tools 1.2.1 → 1.2.3

package/lib/commands/watch.js

@@ -48,7 +48,7 @@ function _default(program) {
     }
 
     var gulpArgs = ["watch", "--gulpfile", _config["default"].gulpFile, "--cwd", _config["default"].themeRoot, "--environment", options.env];
-    if (!options.optimize) gulpArgs.push("--skip-optimization");
+    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

@@ -6,8 +6,6 @@ var sass = require('gulp-sass')(require('sass'));
 
 var postcss = require('gulp-postcss');
 
-var cssimport = require('gulp-cssimport');
-
 var plumber = require('gulp-plumber');
 
 var chokidar = require('chokidar');
@@ -25,7 +23,7 @@ var messages = require('./includes/messages.js');
 
 
 function processCss() {
-  return gulp.src(config.roots.css).pipe(plumber()).pipe(sass().on('error', sass.logError)).pipe(postcss(config.plugins.postcss)).pipe(cssimport()).pipe(gulp.dest(config.dist.assets));
+  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

@@ -6,8 +6,6 @@ var logger = require("debug")("seed-tools");
 
 var findRoot = require("find-root");
 
-var autoprefixer = require("autoprefixer");
-
 var tailwindcss = require("tailwindcss");
 
 var cssnano = require("cssnano");
@@ -50,7 +48,7 @@ try {
 
 
 var config = {
-  environment: argv.environment || "development",
+  environment: argv.environment === "undefined" ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
   themeRoot: themeRoot,
   packageJson: pkg,
@@ -108,9 +106,9 @@ var config = {
     cheerio: {
       run: require("./utilities.js").processSvg
     },
-    postcss: [tailwindcss({
+    postcss: [require('postcss-import'), tailwindcss({
       config: join(themeRoot, tailwindConfig)
-    }), autoprefixer()]
+    }), require('autoprefixer')]
   }
 };
 

package/lib/utils.js

@@ -150,7 +150,7 @@ function getThemeID(themeRoot, environment) {
 
 
 function getDevThemeID(themeRoot) {
-  return getSeedConfig(themeRoot).developmentThemeId;
+  return getSeedConfig(themeRoot).__developmentThemeId;
 }
 /**
  * Given a string, finds the first themeID and returns it, if no themeID found
@@ -190,6 +190,6 @@ function setDevThemeID(themeID) {
     encoding: "utf8"
   });
   data = data.split(_config["default"].seedConfigDelimiter);
-  data[1] = "\n  developmentThemeId: '".concat(themeID, "'") + "\n};";
+  data[1] = "\n  __developmentThemeId: '".concat(themeID, "'") + "\n};";
   (0, _fs.writeFileSync)(_config["default"].seedConfig, data.join(_config["default"].seedConfigDelimiter));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,6 @@
     "find-root": "^1.1.0",
     "gulp": "^4.0.2",
     "gulp-cheerio": "^1.0.0",
-    "gulp-cssimport": "^7.0.0",
     "gulp-ext-replace": "^0.3.0",
     "gulp-if": "^3.0.0",
     "gulp-include": "^2.4.1",
@@ -47,11 +46,12 @@
     "gulp-uglify": "^3.0.2",
     "gulp-zip": "^5.1.0",
     "postcss": "^8.3.6",
+    "postcss-import": "^14.0.2",
     "require-directory": "^2.1.1",
     "sass": "^1.36.0",
     "tailwindcss": "^2.2.7",
     "vinyl-paths": "^3.0.1",
     "yargs": "^17.0.1"
   },
-  "gitHead": "fc7df55c50463311a7eadbf0131e68c448064337"
+  "gitHead": "c8014098190f878e6bd6623c69c9164a1d94001c"
 }

package/src/commands/watch.js

@@ -60,7 +60,7 @@ export default function (program) {
       ];
 
       if (!options.optimize) 
-        gulpArgs.push("--skip-optimization");
+        gulpArgs.push("--skip-optimizations");
  
       process.env.NODE_ENV = options.optimize ? 'production' : 'development';
 

package/src/tasks/build-css.js

@@ -1,11 +1,9 @@
 const gulp = require('gulp');
 const sass = require('gulp-sass')(require('sass'));
 const postcss = require('gulp-postcss');
-const cssimport = require('gulp-cssimport');
 const plumber = require('gulp-plumber');
 const chokidar = require('chokidar');
 
-
 const config = require('./includes/config.js');
 const messages = require('./includes/messages.js');
 
@@ -22,7 +20,6 @@ function processCss() {
     .pipe(plumber())
     .pipe(sass().on('error', sass.logError))
     .pipe(postcss(config.plugins.postcss))
-    .pipe(cssimport())
     .pipe(gulp.dest(config.dist.assets));
 }
 

package/src/tasks/includes/config.js

@@ -1,7 +1,6 @@
 const join = require("path").join;
 const logger = require("debug")("seed-tools");
 const findRoot = require("find-root");
-const autoprefixer = require("autoprefixer");
 const tailwindcss = require("tailwindcss");
 const cssnano = require("cssnano");
 const argv = require("minimist")(process.argv.slice(2));
@@ -41,7 +40,7 @@ try {
  *  @prop {Object} plugins - configuration objects passed to various plugins used in the task interface
  */
 const config = {
-  environment: argv.environment || "development",
+  environment: argv.environment === "undefined" ? "development" : argv.environment,
   optimize: !argv["skip-optimizations"],
   themeRoot,
   packageJson: pkg,
@@ -108,8 +107,9 @@ const config = {
       run: require("./utilities.js").processSvg,
     },
     postcss: [
+      require('postcss-import'),
       tailwindcss({ config: join(themeRoot, tailwindConfig) }),
-      autoprefixer(),
+      require('autoprefixer'),
     ],
   },
 };

package/src/utils.js

@@ -120,7 +120,7 @@ export function getThemeID(themeRoot, environment) {
  * @returns {string} - development store theme ID
  */
 export function getDevThemeID(themeRoot) {
-  return getSeedConfig(themeRoot).developmentThemeId;
+  return getSeedConfig(themeRoot).__developmentThemeId;
 }
 
 /**
@@ -155,6 +155,6 @@ export function logChildProcessOutput(process) {
 export function setDevThemeID(themeID) {
   let data = readFileSync(config.seedConfig, { encoding: "utf8" });
   data = data.split(config.seedConfigDelimiter);
-  data[1] = `\n  developmentThemeId: '${themeID}'` + "\n};";
+  data[1] = `\n  __developmentThemeId: '${themeID}'` + "\n};";
   writeFileSync(config.seedConfig, data.join(config.seedConfigDelimiter));
 }