Add support to WebC for console output.

11ty · May 11, 2024 · ecea5df · ecea5df
1 parent f5c3028
commit ecea5df
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/eleventy-image.webc b/eleventy-image.webc
@@ -98,6 +98,14 @@ async function imagePlugin(attributes, globalPluginOptions) {
 
 	let options = Object.assign({}, globalPluginOptions, instanceOptions);
 
+	// see Util.addConfig
+	if(globalPluginOptions.eleventyConfig) {
+		Object.defineProperty(options, "eleventyConfig", {
+			value: globalPluginOptions.eleventyConfig,
+			enumerable: false,
+		});
+	}
+
 	let metadata = await imagePackage(src, options);
 
 	let imageAttributes = Object.assign({}, defaultGlobalAttributes, attributes);

diff --git a/src/global-options.js b/src/global-options.js
@@ -1,4 +1,5 @@
 const path = require("path");
+const Util = require("./util.js");
 
 function getGlobalOptions(eleventyConfig, options, via) {
   let directories = eleventyConfig.directories;
@@ -9,14 +10,10 @@ function getGlobalOptions(eleventyConfig, options, via) {
     outputDir: path.join(directories.output, options.urlPath || ""),
   }, options);
 
-  // globalOptions.eleventyConfig = eleventyConfig;
   globalOptions.directories = directories;
   globalOptions.generatedVia = via;
 
-  Object.defineProperty(globalOptions, "eleventyConfig", {
-    value: eleventyConfig,
-    enumerable: false,
-  });
+  Util.addConfig(eleventyConfig, globalOptions);
 
   return globalOptions;
 }

diff --git a/src/image-attrs-to-posthtml-node.js b/src/image-attrs-to-posthtml-node.js
@@ -1,4 +1,5 @@
 const eleventyImage = require("../img.js");
+const Util = require("./util.js");
 
 const ATTR_PREFIX = "eleventy:";
 
@@ -57,13 +58,8 @@ async function imageAttributesToPosthtmlNode(attributes, instanceOptions, global
     }
   }
 
-  let cfg = globalPluginOptions.eleventyConfig;
   let options = Object.assign({}, globalPluginOptions, instanceOptions);
-
-  Object.defineProperty(options, "eleventyConfig", {
-    value: cfg,
-    enumerable: false,
-  });
+  Util.addConfig(globalPluginOptions.eleventyConfig, options);
 
   let metadata = await eleventyImage(attributes.src, options);
   let imageAttributes = Object.assign({}, globalPluginOptions.defaultAttributes, attributes);

diff --git a/src/on-request-during-serve-plugin.js b/src/on-request-during-serve-plugin.js
@@ -48,12 +48,7 @@ function eleventyImageOnRequestDuringServePlugin(eleventyConfig, options = {}) {
           generatedVia: Util.KEYS.requested,
         });
 
-        if(eleventyConfig) {
-          Object.defineProperty(opts, "eleventyConfig", {
-            value: eleventyConfig,
-            enumerable: false,
-          });
-        }
+        Util.addConfig(eleventyConfig, opts);
 
         debug( `%o transformed on request to %o at %o width.`, src, imageFormat, width );
 

diff --git a/src/util.js b/src/util.js
@@ -51,6 +51,17 @@ class Util {
   static isRequested(generatedVia) {
     return generatedVia === this.KEYS.requested;
   }
+
+  static addConfig(eleventyConfig, options) {
+    if(!eleventyConfig) {
+      return;
+    }
+
+    Object.defineProperty(options, "eleventyConfig", {
+      value: eleventyConfig,
+      enumerable: false,
+    });
+  }
 }
 
 // Temporary alias for changes made in https://github.com/11ty/eleventy-img/pull/138