sdc-build-wp 4.3.5 → 4.4.1

package/eslint.config.js

@@ -1,23 +1,25 @@
-export default [
+import { defineConfig } from 'eslint/config';
+
+export default defineConfig([
 	{
 		languageOptions: {
 			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module",
+				ecmaVersion: 'latest',
+				sourceType: 'module',
 				ecmaFeatures: {
-					jsx: true,
-				},
-			},
+					jsx: true
+				}
+			}
 		},
 		rules: {
 			semi: 1,
-			indent: [1, "tab"],
-			"no-multiple-empty-lines": [
+			indent: [1, 'tab'],
+			'no-multiple-empty-lines': [
 				1,
 				{
-					max: 1,
-				},
-			],
-		},
+					max: 1
+				}
+			]
+		}
 	}
-];
+]);

package/lib/components/scripts.js

@@ -7,14 +7,14 @@ export default class ScriptsComponent extends BaseComponent {
 
 	constructor() {
 		super();
-		this.description = `Process javascript files`;
+		this.description = `Process script files`;
 	}
 
 	async init() {
-		this.files = this.utils.addEntriesByFiletypes(['.js']);
+		this.files = this.utils.addEntriesByFiletypes(['.js', '.jsx', '.ts', '.tsx']);
 		this.globs = await Array.fromAsync(
-			this.glob(this.project.package?.sdc?.jsGlobPath ||
-			`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/**/*.js`)
+			this.glob(this.project.package?.sdc?.scriptsGlobPath ||
+			`${this.project.path}/${this.project.paths.src.src}/${this.project.paths.src.scripts}/**/*.{js,jsx,ts,tsx}`)
 		);
 		await this.process();
 	}
@@ -23,7 +23,7 @@ export default class ScriptsComponent extends BaseComponent {
 		options = Object.assign({}, {
 			entriesToLint: null
 		}, options);
-		let entryLabel = `/${this.project.paths.dist}/${this.project.paths.src.scripts}/${this.utils.entryBasename(entry).replace('.js', '.min.js')}`;
+		let entryLabel = `/${this.project.paths.dist}/${this.project.paths.src.scripts}/${this.utils.entryBasename(entry).replace(/\.js$|\.jsx$|\.ts$|\.tsx$/g, '.min.js')}`;
 
 		this.start();
 
@@ -49,12 +49,11 @@ export default class ScriptsComponent extends BaseComponent {
 				platform: 'node',
 				entryPoints: [entry],
 				bundle: true,
-				loader: { '.js': 'jsx' },
 				minify: true,
 				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);
@@ -71,8 +70,8 @@ export default class ScriptsComponent extends BaseComponent {
 	}
 
 	async process() {
-		const promisesJS = this.files.map(block => this.build(block.file, { entriesToLint: this.globs }));
-		await Promise.all(promisesJS);
+		const promisesScripts = this.files.map((block, index) => this.build(block.file, { entriesToLint: index == 0 ? this.globs : null }));
+		await Promise.all(promisesScripts);
 	}
 
 	watch() {

package/lib/components/style.js

@@ -11,7 +11,7 @@ export default class StyleComponent extends BaseComponent {
 
 	constructor() {
 		super();
-		this.description = `Process sass files`;
+		this.description = `Process style files`;
 	}
 
 	async init() {
@@ -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
 			});
@@ -140,15 +150,17 @@ export default class StyleComponent extends BaseComponent {
 		if (options.buildTheme) {
 			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,
-					entriesToLint: this.globs
+					entriesToLint: i == 0 ? this.globs : null
 				});
 				if (entry == block.file) {
 					break;
 				}
+				i++;
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "4.3.5",
+	"version": "4.4.1",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"
@@ -23,24 +23,27 @@
 	},
 	"dependencies": {
 		"@stylistic/stylelint-plugin": "^3.1.2",
-		"@wordpress/scripts": "^30.12.0",
-		"autoprefixer": "^10.4.20",
+		"@typescript-eslint/eslint-plugin": "^8.26.1",
+		"@typescript-eslint/parser": "^8.26.1",
+		"@wordpress/scripts": "^30.13.0",
+		"autoprefixer": "^10.4.21",
 		"browser-sync": "^3.0.3",
 		"chalk": "^5.4.1",
 		"chokidar": "^4.0.3",
-		"esbuild": "^0.25.0",
-		"eslint": "^9.21.0",
+		"esbuild": "^0.25.1",
+		"eslint": "^9.22.0",
 		"fs-extra": "^11.3.0",
-		"imagemin": "^9.0.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",
-		"stylelint": "^16.15.0",
+		"stylelint": "^16.16.0",
 		"tail": "^2.2.6"
 	}
 }