sdc-build-wp 4.4.0 → 4.5.0

package/lib/components/images.js

@@ -1,8 +1,7 @@
 import BaseComponent from './base.js';
-import imagemin from 'imagemin';
-import imageminJpegtran from 'imagemin-jpegtran';
-import imageminPngquant from 'imagemin-pngquant';
-import imageminSvgo from 'imagemin-svgo';
+import { promises as fs } from 'fs';
+import sharp from 'sharp';
+import { optimize } from 'svgo';
 
 export default class ImagesComponent extends BaseComponent {
 
@@ -26,17 +25,42 @@ export default class ImagesComponent extends BaseComponent {
 	async build(entry, options) {
 		let timerStart = Date.now();
 		let dest = entry.replace(`${this.project.paths.src.src}/${this.project.paths.src.images}`, `${this.project.paths.dist}/${this.project.paths.src.images}`);
-		const files = await imagemin([entry + '/*'], {
-			destination: dest,
-			plugins: [
-				imageminJpegtran(),
-				imageminPngquant(),
-				imageminSvgo()
-			]
-		});
+		const files = await fs.readdir(entry);
+		await fs.mkdir(dest, { recursive: true });
+
+		let convertedImagesCount = 0;
+		let copiedFilesCount = 0;
+		for (const file of files) {
+			const filePath = this.path.join(entry, file);
+			const destFilePath = `${dest}/${this.path.basename(file)}`;
+			if (this.path.extname(file).toLowerCase() == '.webmanifest') {
+				await fs.copyFile(filePath, destFilePath);
+				copiedFilesCount++;
+				continue;
+			}
+			if (!['.jpg', '.jpeg', '.png', '.svg'].includes(this.path.extname(file).toLowerCase())) { continue; }
+			try {
+				if (this.path.extname(file) == '.svg') {
+					const result = optimize(await fs.readFile(filePath, 'utf8'), {
+						multipass: true,
+						plugins: [
+							'preset-default'
+						]
+					});
+					await fs.writeFile(destFilePath, result.data);
+				} else {
+					await sharp(filePath).toFile(destFilePath);
+				}
+				convertedImagesCount++;
+			} catch (error) {
+				console.error(error);
+				this.log('error', `Failed optimizing ${filePath.replace(this.project.path, '')} - See above error.`);
+			}
+
+		}
 
 		this.end({
-			itemLabel: `${dest.replace(this.project.path, '')} (${files.length} image${files.length == 1 ? '' : 's'})`,
+			itemLabel: `${dest.replace(this.project.path, '')} (${convertedImagesCount} image${convertedImagesCount == 1 ? '' : 's'}${copiedFilesCount ? `, ${copiedFilesCount} file${copiedFilesCount == 1 ? '' : 's'}` : ''})`,
 			timerStart: timerStart,
 			timerEnd: Date.now()
 		});

package/lib/components/scripts.js

@@ -53,7 +53,7 @@ export default class ScriptsComponent extends BaseComponent {
 				outdir: `${this.project.paths.dist}/${this.project.paths.src.scripts}/`,
 				entryNames: '[dir]/[name].min',
 				plugins: [],
-				sourcemap: true
+				sourcemap: process.env.NODE_ENV == 'production' ? false : true
 			});
 			if (result.warnings.length > 0) {
 				log('warn', result.warnings);

package/lib/components/style.js

@@ -116,13 +116,23 @@ export default class StyleComponent extends BaseComponent {
 				throw Error('Linting error');
 			}
 			const compileResult = await sass.compileAsync(entry, {
-				style: 'compressed'
+				style: 'compressed',
+				sourceMap: true
 			});
 			const postcssResult = await postcss([
 				autoprefixer(),
 				sortMQ()
-			]).process(compileResult.css, { from: undefined });
+			]).process(compileResult.css, {
+				from: undefined,
+				to: outFile,
+				map: {
+					inline: false
+				}
+			});
 			await fs.writeFile(outFile, postcssResult.css);
+			if (process.env.NODE_ENV != 'production') {
+				await fs.writeFile(`${outFile}.map`, postcssResult.map.toString());
+			}
 			thisClass.end({
 				itemLabel: entryLabel
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.4.0",
+	"version": "4.5.0",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -33,17 +33,15 @@
 		"esbuild": "^0.25.1",
 		"eslint": "^9.22.0",
 		"fs-extra": "^11.3.0",
-		"imagemin": "^9.0.1",
-		"imagemin-jpegtran": "^8.0.0",
-		"imagemin-pngquant": "^10.0.0",
-		"imagemin-svgo": "^11.0.1",
 		"jiti": "^2.4.2",
 		"minimist": "^1.2.8",
 		"postcss": "^8.5.3",
 		"postcss-scss": "^4.0.9",
 		"postcss-sort-media-queries": "^5.2.0",
 		"sass": "^1.85.1",
+		"sharp": "^0.33.5",
 		"stylelint": "^16.16.0",
+		"svgo": "^3.3.2",
 		"tail": "^2.2.6"
 	}
 }