@madebyseed/seed-cli-tools 1.7.0 → 1.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/tasks/build-css.js +16 -8
  2. package/lib/tasks/includes/config.js +7 -5
  3. package/package.json +2 -2
  4. package/src/tasks/build-css.js +19 -7
  5. package/src/tasks/includes/config.js +7 -5
package/lib/tasks/build-css.js CHANGED
@@ -10,8 +10,6 @@ var postcss = require("gulp-postcss");
10
10
 
11
11
  var plumber = require("gulp-plumber");
12
12
 
13
- var gulpif = require("gulp-if");
14
-
15
13
  var chokidar = require("chokidar");
16
14
 
17
15
  var config = require("./includes/config.js");
@@ -20,13 +18,10 @@ var messages = require("./includes/messages.js");
20
18
 
21
19
  var utils = require("./includes/utilities");
22
20
 
23
- var _require = require("./includes/config.js"),
24
- usesTailwind = _require.usesTailwind;
25
-
26
21
  var tailwindConfig = config.usesTailwind ? require(path.join(config.themeRoot, config.tailwindConfig)) : {};
27
22
  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];
28
23
  /**
29
- * Concatenate css via gulp-cssimport and copys to the `/dist` folder
24
+ * Process css and tailwind
30
25
  *
31
26
  * @param {Array} files
32
27
  * @returns {Stream}
@@ -34,7 +29,19 @@ var assets = config.usesTailwind || tailwindConfig.mode === "jit" ? [config.src.
34
29
  */
35
30
 
36
31
  function processCss() {
37
- return gulp.src(config.roots.css).pipe(plumber(utils.errorHandler)).pipe(gulpif(!usesTailwind, sass())).pipe(postcss(config.plugins.postcss)).pipe(gulpif(usesTailwind, sass())).pipe(gulp.dest(config.dist.assets));
32
+ return gulp.src(config.roots.css).pipe(plumber(utils.errorHandler)).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
33
+ }
34
+ /**
35
+ * Process sass files
36
+ *
37
+ * @param {Array} files
38
+ * @returns {Stream}
39
+ * @private
40
+ */
41
+
42
+
43
+ function processSass() {
44
+ return gulp.src(config.roots.scss).pipe(plumber(utils.errorHandler)).pipe(sass()).pipe(postcss(config.plugins.postcss)).pipe(gulp.dest(config.dist.assets));
38
45
  }
39
46
  /**
40
47
  * Concatenate css via gulp-cssimport
@@ -46,7 +53,7 @@ function processCss() {
46
53
 
47
54
 
48
55
  gulp.task("build:css", function () {
49
- return processCss();
56
+ return Promise.all([processCss(), processSass()]);
50
57
  });
51
58
  /**
52
59
  * Watches css in the `/src` directory
@@ -63,6 +70,7 @@ gulp.task("watch:css", function () {
63
70
  var isCssFile = /\.s[ac]ss$/i.test(path); // Don't log event twice
64
71
 
65
72
  if (isCssFile) {
73
+ processSass();
66
74
  messages.logFileEvent(event, path);
67
75
  }
68
76
 
package/lib/tasks/includes/config.js CHANGED
@@ -65,7 +65,8 @@ var config = {
65
65
  js: "src/scripts/**/*.{js,js.liquid}",
66
66
  vendorJs: "src/scripts/vendor/*.js",
67
67
  json: "src/**/*.json",
68
- css: "src/styles/**/*.{css,scss,scss.liquid}",
68
+ css: "src/styles/**/*.css",
69
+ scss: "src/styles/**/*.scss",
69
70
  cssLint: "src/styles/**/*.{css,scss}",
70
71
  vendorCss: "src/styles/vendor/*.{css,scss}",
71
72
  assets: "src/assets/**/*",
@@ -83,7 +84,8 @@ var config = {
83
84
  js: "tmp/scripts/**/*.{js,js.liquid}",
84
85
  vendorJs: "tmp/scripts/vendor/*.js",
85
86
  json: "tmp/**/*.json",
86
- css: "tmp/styles/**/*.{css,scss,scss.liquid}",
87
+ css: "tmp/styles/**/*.css",
88
+ scss: "tmp/styles/**/*.scss",
87
89
  cssLint: "tmp/styles/**/*.{css,scss}",
88
90
  vendorCss: "tmp/styles/vendor/*.{css,scss}",
89
91
  assets: "tmp/assets/**/*",
@@ -109,11 +111,12 @@ var config = {
109
111
  roots: {
110
112
  js: "src/scripts/*.{js,js.liquid}",
111
113
  vendorJs: "src/scripts/vendor.js",
112
- css: "src/styles/*.{css,scss}"
114
+ css: "src/styles/*.css",
115
+ scss: "src/styles/*.scss"
113
116
  },
114
117
  plugins: {
115
118
  // Added at runtime
116
- postcss: [],
119
+ postcss: [require('postcss-import')],
117
120
  webpack: {
118
121
  mode: !argv["skip-optimizations"] ? 'production' : 'development',
119
122
  output: {
@@ -134,7 +137,6 @@ var config = {
134
137
  };
135
138
 
136
139
  if (config.usesTailwind) {
137
- config.plugins.postcss.push(require('postcss-import'));
138
140
  config.plugins.postcss.push(tailwindcss({
139
141
  config: join(themeRoot, tailwindConfig)
140
142
  }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@madebyseed/seed-cli-tools",
3
- "version": "1.7.0",
3
+ "version": "1.8.0",
4
4
  "description": "Seed CLI Tools",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -55,5 +55,5 @@
55
55
  "webpack-stream": "^7.0.0",
56
56
  "yargs": "^17.0.1"
57
57
  },
58
- "gitHead": "974be44fcc8a575715e52c267296bee81b7eb38a"
58
+ "gitHead": "e8794f33389f17381fd2ae22f326c4d4a7823b1d"
59
59
  }
package/src/tasks/build-css.js CHANGED
@@ -3,13 +3,11 @@ const gulp = require("gulp");
3
3
  const sass = require("gulp-sass")(require("sass"));
4
4
  const postcss = require("gulp-postcss");
5
5
  const plumber = require("gulp-plumber");
6
- const gulpif = require("gulp-if");
7
6
  const chokidar = require("chokidar");
8
7
 
9
8
  const config = require("./includes/config.js");
10
9
  const messages = require("./includes/messages.js");
11
10
  const utils = require("./includes/utilities");
12
- const { usesTailwind } = require("./includes/config.js");
13
11
  const tailwindConfig = config.usesTailwind ? require(path.join(
14
12
  config.themeRoot,
15
13
  config.tailwindConfig
@@ -31,7 +29,7 @@ const assets =
31
29
  : [config.src.css, config.tailwindConfig];
32
30
 
33
31
  /**
34
- * Concatenate css via gulp-cssimport and copys to the `/dist` folder
32
+ * Process css and tailwind
35
33
  *
36
34
  * @param {Array} files
37
35
  * @returns {Stream}
@@ -40,9 +38,22 @@ const assets =
40
38
  function processCss() {
41
39
  return gulp.src(config.roots.css)
42
40
  .pipe(plumber(utils.errorHandler))
43
- .pipe(gulpif(!usesTailwind, sass()))
44
41
  .pipe(postcss(config.plugins.postcss))
45
- .pipe(gulpif(usesTailwind, sass()))
42
+ .pipe(gulp.dest(config.dist.assets))
43
+ }
44
+
45
+ /**
46
+ * Process sass files
47
+ *
48
+ * @param {Array} files
49
+ * @returns {Stream}
50
+ * @private
51
+ */
52
+ function processSass() {
53
+ return gulp.src(config.roots.scss)
54
+ .pipe(plumber(utils.errorHandler))
55
+ .pipe(sass())
56
+ .pipe(postcss(config.plugins.postcss))
46
57
  .pipe(gulp.dest(config.dist.assets))
47
58
  }
48
59
 
@@ -54,7 +65,7 @@ function processCss() {
54
65
  * @static
55
66
  */
56
67
  gulp.task("build:css", () => {
57
- return processCss();
68
+ return Promise.all([processCss(), processSass()]);
58
69
  });
59
70
 
60
71
  /**
@@ -70,9 +81,10 @@ gulp.task("watch:css", () => {
70
81
  const isCssFile = /\.s[ac]ss$/i.test(path);
71
82
  // Don't log event twice
72
83
  if (isCssFile) {
84
+ processSass();
73
85
  messages.logFileEvent(event, path);
74
86
  }
75
87
 
76
- processCss()
88
+ processCss();
77
89
  });
78
90
  });
package/src/tasks/includes/config.js CHANGED
@@ -59,7 +59,8 @@ const config = {
59
59
  js: "src/scripts/**/*.{js,js.liquid}",
60
60
  vendorJs: "src/scripts/vendor/*.js",
61
61
  json: "src/**/*.json",
62
- css: "src/styles/**/*.{css,scss,scss.liquid}",
62
+ css: "src/styles/**/*.css",
63
+ scss: "src/styles/**/*.scss",
63
64
  cssLint: "src/styles/**/*.{css,scss}",
64
65
  vendorCss: "src/styles/vendor/*.{css,scss}",
65
66
  assets: "src/assets/**/*",
@@ -78,7 +79,8 @@ const config = {
78
79
  js: "tmp/scripts/**/*.{js,js.liquid}",
79
80
  vendorJs: "tmp/scripts/vendor/*.js",
80
81
  json: "tmp/**/*.json",
81
- css: "tmp/styles/**/*.{css,scss,scss.liquid}",
82
+ css: "tmp/styles/**/*.css",
83
+ scss: "tmp/styles/**/*.scss",
82
84
  cssLint: "tmp/styles/**/*.{css,scss}",
83
85
  vendorCss: "tmp/styles/vendor/*.{css,scss}",
84
86
  assets: "tmp/assets/**/*",
@@ -106,12 +108,13 @@ const config = {
106
108
  roots: {
107
109
  js: "src/scripts/*.{js,js.liquid}",
108
110
  vendorJs: "src/scripts/vendor.js",
109
- css: "src/styles/*.{css,scss}",
111
+ css: "src/styles/*.css",
112
+ scss: "src/styles/*.scss",
110
113
  },
111
114
 
112
115
  plugins: {
113
116
  // Added at runtime
114
- postcss: [],
117
+ postcss: [require('postcss-import')],
115
118
 
116
119
  webpack: {
117
120
  mode: !argv["skip-optimizations"] ? 'production' : 'development',
@@ -138,7 +141,6 @@ const config = {
138
141
 
139
142
 
140
143
  if (config.usesTailwind) {
141
- config.plugins.postcss.push(require('postcss-import'))
142
144
  config.plugins.postcss.push(tailwindcss({ config: join(themeRoot, tailwindConfig) }))
143
145
  }
144
146