sdc-build-wp 1.2.1 → 1.3.4

package/{.eslintrc.js → .eslintrc}

@@ -1,4 +1,4 @@
-module.exports = {
+{
 	"parserOptions": {
 		"ecmaVersion": 6,
 		"sourceType": "module",
@@ -16,4 +16,4 @@ module.exports = {
 			}
 		]
 	}
-};
+}

package/.stylelintrc

@@ -0,0 +1,23 @@
+{
+	"rules": {
+		"indentation": "tab",
+		"max-empty-lines": 1,
+		"rule-empty-line-before": [
+			"always",
+			{
+				"ignore": [ "after-comment" ]
+			}
+		],
+		"block-opening-brace-space-before": "always-multi-line",
+		"block-opening-brace-newline-after": "always-multi-line",
+		"no-empty-first-line": true,
+		"selector-max-empty-lines": 0,
+		"color-function-notation": "modern",
+		"color-hex-length": "long",
+		"color-no-invalid-hex": true,
+		"color-named": "never",
+		"shorthand-property-no-redundant-values": true,
+		"number-leading-zero": "always",
+		"no-eol-whitespace": true
+	}
+}

package/index.js

@@ -1,21 +1,25 @@
 #!/usr/bin/env node
-const path = require('path');
-const project = require('./lib/project.js');
-const argv = require('minimist')(process.argv.slice(2));
-const chokidar = require('chokidar');
-const glob = require('glob');
+import path from 'path';
+import project from './lib/project.js';
+import parseArgs from 'minimist';
+const argv = parseArgs(process.argv.slice(2));
+import chokidar from 'chokidar';
+import glob from 'glob';
 
-const bustCache = require('./lib/bustCache.js');
-const buildSass = require('./lib/style.js');
-const buildJS = require('./lib/scripts.js');
-const buildImages = require('./lib/images.js');
-const buildFonts = require('./lib/fonts.js');
-const buildBrowserSync = require('./lib/browsersync.js');
+import bustCache from './lib/bustCache.js';
+import buildSass from './lib/style.js';
+import buildJS from './lib/scripts.js';
+import buildImages from './lib/images.js';
+import buildFonts from './lib/fonts.js';
+import buildBrowserSync from './lib/browsersync.js';
 
 let chokidarOpts = {
 	ignoreInitial: true
 };
 
+let sassGlobPath = project.package?.sdc?.sassGlobPath || project.path + '/_src/style/**/*.scss';
+let sassGlob = glob.sync(sassGlobPath);
+
 function bustFunctionsCache() {
 	bustCache(project.path + '/functions.php');
 }
@@ -61,13 +65,13 @@ for (const [name, files] of Object.entries(entries)) {
 }
 
 filesSass.forEach((file) => {
-	buildSass(file);
+	buildSass(file, sassGlob);
 	bustFunctionsCache();
 });
 if (argv.watch) {
-	chokidar.watch(project.path + '/_src/style/**/*', chokidarOpts).on('all', (event, path) => {
+	chokidar.watch(sassGlob, chokidarOpts).on('all', (event, path) => {
 		filesSass.forEach((file) => {
-			buildSass(file);
+			buildSass(file, sassGlob);
 			bustFunctionsCache();
 		});
 	});

package/lib/browsersync.js

@@ -1,5 +1,6 @@
-const project = require('./project.js');
-const browserSync = require('browser-sync').create();
+import project from '../lib/project.js';
+import { create as bsCreate } from 'browser-sync';
+const browserSync = bsCreate();
 
 const buildBrowserSync = () => {
 	browserSync.init({
@@ -25,4 +26,4 @@ const buildBrowserSync = () => {
 	});
 };
 
-module.exports = buildBrowserSync;
+export default buildBrowserSync;

package/lib/bustCache.js

@@ -1,10 +1,8 @@
-const fs = require('fs');
+import fs from 'fs';
 
 const bustCache = (file) => {
 	fs.readFile(file, 'utf8', function (err, data) {
-		if (err) {
-			return console.log(err);
-		}
+		if (err) { return console.log(err); }
 		var result = data.replace(/(\$cacheVersion\ \=\ \')(.*)(\'\;)/g, "$1" + new Date().getTime() + "$3");
 		fs.writeFile(file, result, 'utf8', function (err) {
 			if (err) return console.log(err);
@@ -12,4 +10,4 @@ const bustCache = (file) => {
 	});
 };
 
-module.exports = bustCache;
+export default bustCache;

package/lib/fonts.js

@@ -1,11 +1,19 @@
-const project = require('./project.js');
-const log = require('./logging.js');
-const fs = require('fs-extra');
+import project from '../lib/project.js';
+import log from './logging.js';
+import fs from 'fs-extra';
+import { readdir } from 'fs/promises';
 
 const buildFonts = async (fonts) => {
 	let timerStart = Date.now();
-	await fs.copy(fonts, project.path + '/dist/fonts');
-	log('success', `Built /dist/fonts in ${Date.now() - timerStart}ms`);
+	try {
+		const fontsDir = await readdir(fonts);
+		if (fontsDir.length == 0) { throw new Error('No files in directory'); }
+		await fs.copy(fonts, project.path + '/dist/fonts');
+		log('success', `Built /dist/fonts in ${Date.now() - timerStart}ms`);
+	} catch {
+		log('info', `No files present at ${fonts.replace(project.path, '')}/. Skipping font copy`);
+		return false;
+	}
 };
 
-module.exports = buildFonts;
+export default buildFonts;

package/lib/images.js

@@ -1,9 +1,9 @@
-const project = require('./project.js');
-const log = require('./logging.js');
-const imagemin = require('imagemin');
-const imageminJpegtran = require('imagemin-jpegtran');
-const imageminPngquant = require('imagemin-pngquant');
-const imageminSvgo = require('imagemin-svgo');
+import project from '../lib/project.js';
+import log from './logging.js';
+import imagemin from 'imagemin';
+import imageminJpegtran from 'imagemin-jpegtran';
+import imageminPngquant from 'imagemin-pngquant';
+import imageminSvgo from 'imagemin-svgo';
 
 const buildImages = async (images) => {
 	let timerStart = Date.now();
@@ -18,4 +18,4 @@ const buildImages = async (images) => {
 	log('success', `Built /dist/images/${images.replace(project.path + '/_src/images/', '')} in ${Date.now() - timerStart}ms`);
 };
 
-module.exports = buildImages;
+export default buildImages;

package/lib/logging.js

@@ -1,7 +1,6 @@
 // based heavily on Nick Salloum's 'node-pretty-log'
 // https://github.com/callmenick/node-pretty-log
-
-const chalk = require('chalk');
+import chalk from 'chalk';
 
 function getTime() {
 	return new Date().toLocaleTimeString('en-US');
@@ -12,7 +11,7 @@ function log(type, ...messages) {
 		case 'success':
 			console.log.call(
 				console,
-				chalk.green('✓'),
+				chalk.green('✔'),
 				chalk.gray(getTime()),
 				...messages
 			);
@@ -20,7 +19,7 @@ function log(type, ...messages) {
 		case 'error':
 			console.log.call(
 				console,
-				chalk.red('×'),
+				chalk.red('✖'),
 				chalk.bgRed.gray(getTime()),
 				...messages
 			);
@@ -28,7 +27,7 @@ function log(type, ...messages) {
 		case 'warn':
 			console.log.call(
 				console,
-				chalk.yellow('!'),
+				chalk.yellow('⚠'),
 				chalk.bgYellow.gray(getTime()),
 				...messages
 			);
@@ -45,4 +44,4 @@ function log(type, ...messages) {
 	}
 }
 
-module.exports = log;
+export default log;

package/lib/project.js

@@ -1,4 +1,6 @@
-module.exports = {
+import { readFile } from 'fs/promises';
+
+export default {
 	path: process.cwd(),
-	package: require(process.cwd() + '/package.json')
+	package: JSON.parse(await readFile(new URL(process.cwd() + '/package.json', import.meta.url)))
 };

package/lib/scripts.js

@@ -1,16 +1,16 @@
-const path = require('path');
-const project = require('./project.js');
-const log = require('./logging.js');
-const esbuild = require('esbuild');
-const { ESLint } = require('eslint');
-const eslintConfig = require('../.eslintrc.js');
+import path from 'path';
+import project from '../lib/project.js';
+import log from './logging.js';
+import esbuild from 'esbuild';
+import { ESLint } from 'eslint';
+import { readFile } from 'fs/promises';
 
 const buildJS = async (entry) => {
 	let entryLabel = `/dist/scripts/${path.parse(entry).base.replace('.js', '.min.js')}`;
 	let timerStart = Date.now();
 	try {
 		const eslint = new ESLint({
-			baseConfig: eslintConfig,
+			baseConfig: JSON.parse(await readFile(new URL('../.eslintrc', import.meta.url))),
 			fix: true
 		});
 		const lintresults = await eslint.lintFiles([entry]);
@@ -45,4 +45,4 @@ const buildJS = async (entry) => {
 	log('success', `Built ${entryLabel} in ${Date.now() - timerStart}ms`);
 };
 
-module.exports = buildJS;
+export default buildJS;

package/lib/style.js

@@ -1,21 +1,22 @@
-const fs = require('fs');
-const path = require('path');
-const project = require('./project.js');
-const log = require('./logging.js');
-const sass = require('sass');
-const postcss = require('postcss');
-const autoprefixer = require('autoprefixer');
-const sortMQ = require('postcss-sort-media-queries');
-const stylelint = require('stylelint');
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import project from '../lib/project.js';
+import log from './logging.js';
+import sass from 'sass';
+import postcss from 'postcss';
+import autoprefixer from 'autoprefixer';
+import sortMQ from 'postcss-sort-media-queries';
+import stylelint from 'stylelint';
 
-const buildSass = (entry) => {
+const buildSass = (entry, entriesToLint) => {
 	let timerStart = Date.now();
 	let outFile = project.path + '/dist/style/' + path.parse(entry).name + '.min.css';
 	let entryLabel = outFile.replace(project.path, '');
 	stylelint.lint({
-		configFile: path.resolve(__dirname, '../stylelint.config.js'),
+		configFile: path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../.stylelintrc'),
 		formatter: 'string',
-		files: [entry],
+		files: entriesToLint || [entry],
 		customSyntax: 'postcss-scss',
 		fix: true
 	}).then((data) => {
@@ -47,6 +48,8 @@ const buildSass = (entry) => {
 				fs.writeFile(outFile, resultPost.css, function(err) {
 					if (err) {
 						console.log(err);
+						log('error', `Failed saving ${entryLabel} - See above error.`);
+						return false;
 					} else {
 						log('success', `Built ${entryLabel} in ${Date.now() - timerStart}ms`);
 					}
@@ -57,4 +60,4 @@ const buildSass = (entry) => {
 
 };
 
-module.exports = buildSass;
+export default buildSass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdc-build-wp",
-  "version": "1.2.1",
+  "version": "1.3.4",
   "description": "Custom WordPress build process.",
   "author": {
     "name": "Robert Sefer",
@@ -11,6 +11,7 @@
     "type": "git",
     "url": "git://github.com/SeferDesign/sdc-build-wp.git"
   },
+  "type": "module",
   "scripts": {
     "test": "echo \"Skipping tests.\""
   },
@@ -20,21 +21,21 @@
   "dependencies": {
     "autoprefixer": "^10.4.0",
     "browser-sync": "^2.27.7",
-    "chalk": "^4.1.2",
+    "chalk": "^5.0.0",
     "chokidar": "^3.5.2",
-    "esbuild": "^0.13.11",
-    "eslint": "^8.1.0",
+    "esbuild": "^0.14.8",
+    "eslint": "^8.5.0",
     "fs-extra": "^10.0.0",
     "glob": "^7.2.0",
-    "imagemin": "^7.0.1",
+    "imagemin": "^8.0.1",
     "imagemin-jpegtran": "^7.0.0",
     "imagemin-pngquant": "^9.0.2",
-    "imagemin-svgo": "^9.0.0",
+    "imagemin-svgo": "^10.0.1",
     "minimist": "^1.2.5",
-    "postcss": "^8.3.11",
+    "postcss": "^8.4.5",
     "postcss-scss": "^4.0.2",
-    "postcss-sort-media-queries": "^4.1.0",
-    "sass": "^1.43.4",
-    "stylelint": "^14.0.1"
+    "postcss-sort-media-queries": "^4.2.1",
+    "sass": "^1.45.1",
+    "stylelint": "^14.2.0"
   }
 }

package/stylelint.config.js

@@ -1,15 +0,0 @@
-module.exports = {
-  "rules": {
-    "indentation": "tab",
-    "max-empty-lines": 1,
-    "rule-empty-line-before": [
-      "always",
-      {
-        "ignore": [
-          "after-comment"
-        ]
-      }
-    ],
-    "color-no-invalid-hex": true
-  }
-};