sdc-build-wp 4.6.0 → 4.6.2

package/index.js

@@ -43,7 +43,9 @@ project.builds = argv.builds ? (Array.isArray(argv.builds) ? argv.builds : argv.
 
 (async() => {
 
-	if (argv.watch) {
+	if (argv.watch && project.builds.includes('server')) {
+		project.builds.splice(project.builds.indexOf('server'), 1);
+		project.builds.unshift('server');
 		project.components.server.serve(false);
 	}
 
@@ -56,7 +58,9 @@ project.builds = argv.builds ? (Array.isArray(argv.builds) ? argv.builds : argv.
 	await Promise.all(promisesBuilds);
 	log('info', `Finished initial build in ${Math.round((performance.now() - initialBuildTimerStart) / 1000)} seconds`);
 
-	if (argv.watch) {
+	if (argv.watch && project.builds.includes('server')) {
+		project.builds.splice(project.builds.indexOf('server'), 1);
+		project.builds.push('server');
 		log('info', `Started watching [${project.builds.join(', ')}]`);
 		for (let build of project.builds) {
 			await project.components[build].watch();

package/lib/components/base.js

@@ -15,6 +15,7 @@ class BaseComponent {
 		this.project = project;
 		this.log = log;
 		this.chokidar = chokidar;
+		this.watcher = null;
 		this.glob = glob;
 		this.files = [];
 		this.globs = [];

package/lib/components/blocks.js

@@ -86,7 +86,9 @@ export default class BlocksComponent extends BaseComponent {
 			this.chokidar.watch(`${block}/src`, {
 				...this.project.chokidarOpts
 			}).on('all', (event, path) => {
-				this.process(block);
+				if (!['unlink', 'unlinkDir'].includes(event)) {
+					this.process(block);
+				}
 			});
 		}
 	}

package/lib/components/fonts.js

@@ -42,7 +42,7 @@ export default class FontsComponent extends BaseComponent {
 	}
 
 	watch() {
-		this.chokidar.watch(this.globs, {
+		this.watcher = this.chokidar.watch(this.globs, {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
 			this.process();

package/lib/components/images.js

@@ -32,6 +32,9 @@ export default class ImagesComponent extends BaseComponent {
 		let convertedImagesCount = 0;
 		let copiedFilesCount = 0;
 		for (const file of files) {
+			if (file == '.DS_Store') {
+				continue;
+			}
 			const filePath = this.path.join(entry, file);
 			const destFilePath = `${dest}/${this.path.basename(file)}`;
 			if (!this.compressableFileFormats.includes(this.path.extname(file).toLowerCase())) {
@@ -74,7 +77,7 @@ export default class ImagesComponent extends BaseComponent {
 	}
 
 	watch() {
-		this.chokidar.watch(this.project.paths.images, {
+		this.watcher = this.chokidar.watch(this.project.paths.images, {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
 			this.process();

package/lib/components/php.js

@@ -87,10 +87,12 @@ export default class PHPComponent extends BaseComponent {
 	}
 
 	watch() {
-		this.chokidar.watch(this.globs, {
+		this.watcher = this.chokidar.watch(this.globs, {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
-			this.process(path);
+			if (!['unlink', 'unlinkDir'].includes(event)) {
+				this.process(path);
+			}
 		});
 	}
 

package/lib/components/scripts.js

@@ -70,12 +70,12 @@ export default class ScriptsComponent extends BaseComponent {
 	}
 
 	async process() {
-		const promisesScripts = this.files.map((block, index) => this.build(block.file, { entriesToLint: index == 0 ? this.globs : null }));
+		const promisesScripts = this.files.map((group, index) => this.build(group.file, { entriesToLint: index == 0 ? this.globs : null }));
 		await Promise.all(promisesScripts);
 	}
 
 	watch() {
-		this.chokidar.watch(this.globs, {
+		this.watcher = this.chokidar.watch(this.globs, {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
 			this.process();

package/lib/components/server.js

@@ -16,7 +16,7 @@ export default class ServerComponent extends BaseComponent {
 			this.watchedFiles.push(`**/*.php`);
 		}
 		this.ignoredFiles = [
-			`node_modules/**/*`,
+			`node_modules/**`,
 			`vendor/**/*`,
 			`**/*.map`
 		];
@@ -74,7 +74,10 @@ export default class ServerComponent extends BaseComponent {
 	}
 
 	async watch() {
-		this.server.watch(this.watchedFiles, (event, file) => {
+		this.server.watch(this.watchedFiles, {
+			ignored: this.ignoredFiles,
+			ignoreInitial: true
+		}, (event, file) => {
 			if (['add', 'addDir', 'change'].includes(event)) {
 				this.server.reload(file);
 				if (file.split('.').pop() == 'css') {

package/lib/components/style.js

@@ -160,13 +160,13 @@ export default class StyleComponent extends BaseComponent {
 			await this.buildTheme();
 		}
 		let i = 0;
-		for (var block of this.files) {
-			if (!entry || entry == block.file) {
-				await this.build(block.file, {
-					name: block.name,
+		for (let group of this.files) {
+			if (!entry || entry == group.file) {
+				await this.build(group.file, {
+					name: group.name,
 					entriesToLint: i == 0 ? this.globs : null
 				});
-				if (entry == block.file) {
+				if (entry == group.file) {
 					break;
 				}
 				i++;
@@ -175,16 +175,16 @@ export default class StyleComponent extends BaseComponent {
 	}
 
 	watch() {
-		this.chokidar.watch([
+		this.watcher = this.chokidar.watch([
 			...[this.project.paths.theme.json],
 			this.globs
 		], {
 			...this.project.chokidarOpts
 		}).on('all', (event, path) => {
 			let hasRanSingle = false;
-			for (var block of this.files) {
-				if (path == block.file || this.utils.getImportedSASSFiles(block.file).includes(path)) {
-					this.process(block.file, { buildTheme: path == this.project.paths.theme.json });
+			for (let group of this.files) {
+				if (path == group.file || this.utils.getImportedSASSFiles(group.file).includes(path)) {
+					this.process(group.file, { buildTheme: path == this.project.paths.theme.json });
 					hasRanSingle = true;
 				}
 			}

package/lib/project.js

@@ -43,12 +43,13 @@ project.paths = {
 project.chokidarOpts = {
 	ignoreInitial: true,
 	ignored: [
+		/(^|[\/\\])\.DS_Store$/,
 		project.paths.nodeModules,
 		`${project.paths.nodeModules}/**/*`,
 		project.paths.composer.vendor,
 		`${project.paths.composer.vendor}/**/*`,
 		project.paths.theme.scss,
-		`${project.path}/blocks/*/build/*.php`
+		`${project.path}/blocks/*/build/*.php`,
 	]
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.6.0",
+	"version": "4.6.2",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -22,24 +22,24 @@
 		"sdc-build-wp": "./index.js"
 	},
 	"dependencies": {
-		"@stylistic/stylelint-plugin": "^3.1.2",
-		"@typescript-eslint/eslint-plugin": "^8.35.0",
-		"@typescript-eslint/parser": "^8.35.0",
-		"@wordpress/scripts": "^30.19.0",
+		"@stylistic/stylelint-plugin": "^4.0.0",
+		"@typescript-eslint/eslint-plugin": "^8.38.0",
+		"@typescript-eslint/parser": "^8.38.0",
+		"@wordpress/scripts": "^30.20.0",
 		"autoprefixer": "^10.4.21",
 		"browser-sync": "^3.0.4",
 		"chalk": "^5.4.1",
 		"chokidar": "^4.0.3",
-		"esbuild": "^0.25.5",
-		"eslint": "^9.29.0",
+		"esbuild": "^0.25.8",
+		"eslint": "^9.31.0",
 		"fs-extra": "^11.3.0",
 		"minimist": "^1.2.8",
 		"postcss": "^8.5.6",
 		"postcss-scss": "^4.0.9",
 		"postcss-sort-media-queries": "^5.2.0",
 		"sass": "^1.89.2",
-		"sharp": "^0.34.2",
-		"stylelint": "^16.21.0",
+		"sharp": "^0.34.3",
+		"stylelint": "^16.22.0",
 		"svgo": "^4.0.0",
 		"tail": "^2.2.6"
 	}