@apleasantview/eleventy-plugin-baseline 0.1.0-next.14 → 0.1.0-next.16

package/core/shortcodes/image.js

@@ -34,6 +34,7 @@ function pickRenditions(metadata) {
  * @param {string} [options.outputDir=DEFAULT_OUTPUT.outputDir] Output directory for generated assets.
  * @param {string} [options.urlPath=DEFAULT_OUTPUT.urlPath]       Public URL base for generated assets.
  * @param {Object} [options.attrs={}]                   Extra attributes applied to <img>; `class` merges with imageClass.
+ * @param {string} [options.style]                      Inline style applied to <img> (alias for attrs.style).
  * @param {boolean} [options.figure=true]               Wrap in <figure> when caption is provided.
  * @param {boolean} [options.setDimensions=true]        When false, omit width/height on <img>.
  */
@@ -45,6 +46,7 @@ export async function imageShortcode(options = {}) {
 		loading = "lazy",
 		containerClass = "",
 		imageClass = "",
+		style,
 		widths = DEFAULT_WIDTHS,
 		sizes = DEFAULT_SIZES,
 		formats = DEFAULT_FORMATS,
@@ -62,6 +64,9 @@ export async function imageShortcode(options = {}) {
 		);
 	}
 
+	const normalizedCaption = caption == null ? "" : String(caption);
+	const normalizedAlt = alt == null ? "" : String(alt);
+
 	const inputDir = this?.eleventy?.directories?.input;
 	const isRemote = /^https?:\/\//i.test(src);
 	const resolvedSrc = !isRemote && inputDir
@@ -99,10 +104,11 @@ export async function imageShortcode(options = {}) {
 
 	const imageAttributes = {
 		src: lowsrc.url,
-		alt,
+		alt: normalizedAlt,
 		loading,
 		decoding: loading === "eager" ? "sync" : "async",
 		class: combinedClass,
+		style,
 		...(setDimensions ? { width: highsrc.width, height: highsrc.height } : {}),
 		...restAttrs,
 		"eleventy:ignore": true
@@ -120,10 +126,10 @@ export async function imageShortcode(options = {}) {
 	<img ${imgAttrString}>
 </picture>`;
 
-	if (!figure || !caption) return picture;
+	if (!figure || !normalizedCaption) return picture;
 
 	return `<figure>
 	${picture}
-	<figcaption>${caption}</figcaption>
+	<figcaption>${normalizedCaption}</figcaption>
 </figure>`;
 }

package/modules/assets-esbuild/plugins/assets-esbuild.js

@@ -52,6 +52,19 @@ export default function assetsESBuild(eleventyConfig, options = {}) {
 	// Filter to inline a bundled entry.
 	eleventyConfig.addFilter("inlineESbuild", inlineESbuild);
 
+	// Filter to inline a bundled entry (async, works with callback or promise).
+	eleventyConfig.addAsyncFilter("inlineESbuild", async function (jsFilePath, callback) {
+		const done = typeof callback === "function" ? callback : null;
+		try {
+			const html = await inlineESbuild(jsFilePath);
+			if (done) return done(null, html);
+			return html;
+		} catch (error) {
+			if (done) return done(error);
+			throw error;
+		}
+	});
+
 	// Override the default collection behavior. Adding js as template format and extension collects 11tydata.js files.
 	eleventyConfig.addCollection("all", function (collectionApi) {
 		return collectionApi.getAll().filter(item => {

package/modules/assets-postcss/filters/inline-postcss.js

@@ -3,6 +3,9 @@ import postcss from "postcss";
 import loadPostCSSConfig from "postcss-load-config";
 import fallbackPostCSSConfig from "../fallback/postcss.config.js";
 
+// Resolve user PostCSS config from the project root (cwd), not the Eleventy input dir.
+const configRoot = process.cwd();
+
 export default async function inlinePostCSS(cssFilePath) {
 	try {
 		let cssContent = await fs.readFile(cssFilePath, 'utf8');
@@ -15,7 +18,9 @@ export default async function inlinePostCSS(cssFilePath) {
 			({ plugins, options } = await loadPostCSSConfig({}, configRoot));
 		} catch (error) {
 			// If none is found, fall back to the bundled Baseline config to keep builds working.
-			({plugins, ...options } = fallbackPostCSSConfig);
+			const { plugins: fallbackPlugins, ...fallbackOptions } = fallbackPostCSSConfig;
+			plugins = fallbackPlugins;
+			options = fallbackOptions;
 		}
 
 		let result = await postcss(plugins).process(cssContent, {

package/modules/assets-postcss/plugins/assets-postcss.js

@@ -57,6 +57,16 @@ export default function assetsPostCSS(eleventyConfig) {
 		}
 	});
 
-	// Filter to inline a bundled entry.
-	eleventyConfig.addFilter("inlinePostCSS", inlinePostCSS);
+	// Filter to inline a bundled entry; supports callback style (Nunjucks/Liquid) and Promise return.
+	eleventyConfig.addAsyncFilter("inlinePostCSS", async function (cssFilePath, callback) {
+		const done = typeof callback === "function" ? callback : null;
+		try {
+			const html = await inlinePostCSS(cssFilePath);
+			if (done) return done(null, html);
+			return html;
+		} catch (error) {
+			if (done) return done(error);
+			throw error;
+		}
+	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apleasantview/eleventy-plugin-baseline",
-  "version": "0.1.0-next.14",
+  "version": "0.1.0-next.16",
   "description": "An experimental Swiss army knife toolkit for Eleventy",
   "type": "module",
   "main": "eleventy.config.js",