Restore via param for #223 to reuse correct global options.

11ty · Apr 21, 2024 · f3e8e8d · f3e8e8d
1 parent 3a04484
commit f3e8e8d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/img.js b/img.js
@@ -118,8 +118,8 @@ class Image {
 
     // Compatible with eleventy-dev-server and Eleventy 3.0.0-alpha.7+ in serve mode.
     if(this.options.transformOnRequest && !this.options.urlFormat) {
-      this.options.urlFormat = function({ src, width, format }/*, imageOptions*/) {
-        return `/.11ty/image/?src=${encodeURIComponent(src)}&width=${width}&format=${format}`;
+      this.options.urlFormat = function({ src, width, format }/*, imageOptions*/, options) {
+        return `/.11ty/image/?src=${encodeURIComponent(src)}&width=${width}&format=${format}${options.generatedVia ? `&via=${options.generatedVia}` : ""}`;
       };
 
       this.options.statsOnly = true;

diff --git a/src/global-options.js b/src/global-options.js
@@ -1,6 +1,6 @@
 const path = require("path");
 
-function getGlobalOptions(directories, options) {
+function getGlobalOptions(directories, options, via) {
   let globalOptions = Object.assign({
     packages: {
       image: require("../"),
@@ -9,6 +9,7 @@ function getGlobalOptions(directories, options) {
   }, options);
 
   globalOptions.directories = directories;
+  globalOptions.generatedVia = via;
 
   return globalOptions;
 }

diff --git a/src/transform-plugin.js b/src/transform-plugin.js
@@ -67,7 +67,7 @@ function eleventyImageTransformPlugin(eleventyConfig, options = {}) {
 
   // Notably, global options are not shared automatically with the WebC `eleventyImagePlugin` above.
   // Devs can pass in the same object to both if they want!
-  let opts = getGlobalOptions(eleventyConfig.directories, options);
+  let opts = getGlobalOptions(eleventyConfig.directories, options, "transform");
 
   eleventyConfig.addJavaScriptFunction("__private_eleventyImageTransformConfigurationOptions", () => {
     return opts;

diff --git a/src/webc-options-plugin.js b/src/webc-options-plugin.js
@@ -9,7 +9,7 @@ function eleventyWebcOptionsPlugin(eleventyConfig, options = {}) {
   // Notably, global options are not shared automatically with the `eleventyImageTransformPlugin` below.
   // Devs can pass in the same object to both if they want!
   eleventyConfig.addJavaScriptFunction("__private_eleventyImageConfigurationOptions", () => {
-    return getGlobalOptions(eleventyConfig.directories, options);
+    return getGlobalOptions(eleventyConfig.directories, options, "webc");
   });
 
   if(options.transformOnRequest !== false) {

diff --git a/test/test-webc.mjs b/test/test-webc.mjs
@@ -66,5 +66,5 @@ test("With transform on request during dev mode", async t => {
   });
 
   let results = await elev.toJSON();
-  t.is(normalizeEscapedPaths(results[0].content), `<img loading="lazy" src="/.11ty/image/?src=.%2Ftest%2Fbio-2017.jpg&amp;width=1280&amp;format=jpeg" alt="My ugly mug" width="1280" height="853">`);
+  t.is(normalizeEscapedPaths(results[0].content), `<img loading="lazy" src="/.11ty/image/?src=.%2Ftest%2Fbio-2017.jpg&amp;width=1280&amp;format=jpeg&amp;via=webc" alt="My ugly mug" width="1280" height="853">`);
 });
diff --git a/test/transform-test.mjs b/test/transform-test.mjs
@@ -51,7 +51,7 @@ test("Using the transform plugin with transform on request during dev mode", asy
   });
 
   let results = await elev.toJSON();
-  t.is(normalizeEscapedPaths(results[0].content), `<img src="/.11ty/image/?src=test%2Fbio-2017.jpg&width=1280&format=jpeg" alt="My ugly mug" width="1280" height="853">`);
+  t.is(normalizeEscapedPaths(results[0].content), `<img src="/.11ty/image/?src=test%2Fbio-2017.jpg&width=1280&format=jpeg&via=transform" alt="My ugly mug" width="1280" height="853">`);
 });
 
 test("Using the transform plugin with transform on request during dev mode (with default attributes)", async t => {
@@ -72,7 +72,7 @@ test("Using the transform plugin with transform on request during dev mode (with
   });
 
   let results = await elev.toJSON();
-  t.is(normalizeEscapedPaths(results[0].content), `<img loading="lazy" src="/.11ty/image/?src=test%2Fbio-2017.jpg&width=1280&format=jpeg" alt="My ugly mug" width="1280" height="853">`);
+  t.is(normalizeEscapedPaths(results[0].content), `<img loading="lazy" src="/.11ty/image/?src=test%2Fbio-2017.jpg&width=1280&format=jpeg&via=transform" alt="My ugly mug" width="1280" height="853">`);
 });