If you pass in your eleventyConfig in your Image options, you’ll get …

…support for console output (via shortcode method)
11ty · May 11, 2024 · d7303ed · d7303ed
1 parent ecea5df
commit d7303ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/img.js b/img.js
@@ -747,13 +747,13 @@ function logProcessedMessage(eleventyConfig, src, opts) {
   }
 
   eleventyConfig.logger.logWithOptions({
-    message: `Processing ${logSrc} (${opts.generatedVia})`,
+    message: `Processing ${logSrc}${opts.generatedVia ? ` (${opts.generatedVia})` : ""}`,
     prefix: "[11ty/eleventy-img]"
   });
 }
 
 function setupLogger(eleventyConfig, opts) {
-  if(typeof eleventyConfig?.logger?.logWithOptions !== "function" || Util.isRequested(opts.generatedVia)) {
+  if(typeof eleventyConfig?.logger?.logWithOptions !== "function" || Util.isRequested(opts?.generatedVia)) {
     return;
   }
 
@@ -794,8 +794,15 @@ function setupLogger(eleventyConfig, opts) {
 }
 
 function queueImage(src, opts) {
-  let img = new Image(src, opts);
   let eleventyConfig = opts?.eleventyConfig;
+  if(opts?.eleventyConfig && opts.propertyIsEnumerable("eleventyConfig")) {
+    delete opts.eleventyConfig;
+    Util.addConfig(eleventyConfig, opts);
+  }
+
+  let img = new Image(src, opts);
+
+
   let key;
   let resolvedOptions = img.options;
 
@@ -887,6 +894,8 @@ module.exports.getHash = function getHash(src, options) {
   return img.getHash();
 };
 
+module.exports.setupLogger = setupLogger;
+
 const generateHTML = require("./src/generate-html.js");
 module.exports.generateHTML = generateHTML;
 module.exports.generateObject = generateHTML.generateObject;

diff --git a/src/on-request-during-serve-plugin.js b/src/on-request-during-serve-plugin.js
@@ -2,6 +2,7 @@ const fs = require("fs");
 const { TemplatePath } = require("@11ty/eleventy-utils");
 
 const eleventyImage = require("../img.js");
+const setupLogger = eleventyImage.setupLogger;
 const Util = require("./util.js");
 
 const debug = require("debug")("Eleventy:Image");
@@ -14,6 +15,8 @@ function eleventyImageOnRequestDuringServePlugin(eleventyConfig, options = {}) {
     console.log( `[11ty/eleventy-img] Warning: your version of Eleventy is incompatible with the dynamic image rendering plugin (see \`eleventyImageOnRequestDuringServePlugin\`). Any dynamically rendered images will 404 (be missing) during --serve mode but will not affect the standard build output: ${e.message}` );
   }
 
+  setupLogger(eleventyConfig, {});
+
   // Eleventy 3.0 or newer only.
   eleventyConfig.setServerOptions({
     onRequest: {