sdc-build-wp 2.6.1 → 2.7.1

package/index.js

@@ -24,6 +24,10 @@ let sassGlob = glob.sync(sassGlobPath, {
 		project.path  + '/_src/style/partials/_theme.scss'
 	]
 });
+let jsGlobPath = project.package?.sdc?.jsGlobPath || project.path + '/_src/scripts/**/*.js';
+let jsGlob = glob.sync(jsGlobPath, {
+	ignore: []
+});
 let blockGlobPath = project.package?.sdc?.blockGlobPath || project.path + '/_src/blocks/**/*.{js,jsx}';
 let blockGlob = glob.sync(blockGlobPath);
 
@@ -54,6 +58,7 @@ for (var filename of sassBlocksGlob) {
 }
 
 let filesSass = [];
+let filesJS = [];
 
 for (const [name, files] of Object.entries(entries)) {
 	files.forEach(function(file) {
@@ -65,14 +70,10 @@ for (const [name, files] of Object.entries(entries)) {
 				});
 				break;
 			case '.js':
-				buildJS(file);
-				bustFunctionsCache();
-				if (argv.watch) {
-					chokidar.watch(file, chokidarOpts).on('all', (event, path) => {
-						buildJS(path);
-						bustFunctionsCache();
-					});
-				}
+				filesJS.push({
+					'name': name,
+					'file': file
+				});
 				break;
 		}
 	});
@@ -100,6 +101,21 @@ if (argv.watch) {
 		runSass();
 	});
 }
+
+function runJS() {
+	for (var block of filesJS) {
+		buildJS(block.file, block.name, jsGlob);
+		bustFunctionsCache();
+	}
+}
+
+runJS();
+if (argv.watch) {
+	chokidar.watch(jsGlob, chokidarOpts).on('all', (event, path) => {
+		runJS();
+	});
+}
+
 if (argv.watch) {
 	chokidar.watch(project.path + '/theme.json', chokidarOpts).on('all', (event, path) => {
 		runSass();

package/lib/bustCache.js

@@ -3,6 +3,7 @@ import fs from 'fs';
 const bustCache = (file) => {
 	fs.readFile(file, 'utf8', function (err, data) {
 		if (err) { return console.log(err); }
+		if (!data.includes('$cacheVersion')) { return; }
 		var result = data.replace(/(\$cacheVersion\ \=\ \')(.*)(\'\;)/g, "$1" + new Date().getTime() + "$3");
 		fs.writeFile(file, result, 'utf8', function (err) {
 			if (err) return console.log(err);

package/lib/scripts.js

@@ -5,7 +5,7 @@ import esbuild from 'esbuild';
 import { ESLint } from 'eslint';
 import { readFile } from 'fs/promises';
 
-const buildJS = async (entry) => {
+const buildJS = async (entry, name, entriesToLint) => {
 	let entryLabel = `/dist/scripts/${path.parse(entry).base.replace('.js', '.min.js')}`;
 	let timerStart = Date.now();
 	try {
@@ -13,7 +13,7 @@ const buildJS = async (entry) => {
 			baseConfig: JSON.parse(await readFile(new URL('../.eslintrc', import.meta.url))),
 			fix: true
 		});
-		const lintresults = await eslint.lintFiles([entry]);
+		const lintresults = await eslint.lintFiles(entriesToLint || [entry]);
 		await ESLint.outputFixes(lintresults);
 		const formatter = await eslint.loadFormatter('stylish');
 		const formatterOutput = formatter.format(lintresults);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdc-build-wp",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "description": "Custom WordPress build process.",
   "author": {
     "name": "Robert Sefer",