Merge branch 'main' of github.com:11ty/eleventy-img

11ty · Apr 21, 2024 · 5ff8997 · 5ff8997
2 parents f3e8e8d + f894cfd
commit 5ff8997
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 39 deletions.
diff --git a/img.js b/img.js
@@ -617,21 +617,18 @@ class Image {
             // Should never write when dryRun is true
             outputFilePromises.push(
               fsp.mkdir(path.dirname(stat.outputPath), { recursive: true })
-                .then(() => processingQueue.add(async () => sharpInstance.toFile(stat.outputPath)))
+                .then(() => sharpInstance.toFile(stat.outputPath))
                 .then(info => {
                   stat.size = info.size;
                   return stat;
                 })
             );
           } else {
-            outputFilePromises.push(
-              processingQueue.add(async () => sharpInstance.toBuffer({ resolveWithObject: true }))
-                .then(({ data, info }) => {
-                  stat.buffer = data;
-                  stat.size = info.size;
-                  return stat;
-                })
-            );
+            outputFilePromises.push(sharpInstance.toBuffer({ resolveWithObject: true }).then(({ data, info }) => {
+              stat.buffer = data;
+              stat.size = info.size;
+              return stat;
+            }));
           }
         }
 
@@ -739,7 +736,7 @@ function queueImage(src, opts) {
 
   debug("Processing %o (in-memory cache miss), options: %o", src, opts);
 
-  let promise = (async () => {
+  let promise = processingQueue.add(async () => {
     if(typeof src === "string" && resolvedOptions.statsOnly) {
       if(Util.isRemoteUrl(src)) {
         if(opts.remoteImageMetadata?.width && opts.remoteImageMetadata?.height) {
@@ -767,7 +764,7 @@ function queueImage(src, opts) {
 
     let input = await img.getInput();
     return img.resize(input);
-  })();
+  });
 
   if(img.options.useCache) {
     memCache.add(key, promise);

diff --git a/test/test.js b/test/test.js
@@ -1,6 +1,5 @@
 const path = require("path");
 const test = require("ava");
-const os = require("os");
 const fs = require("fs");
 const { URL } = require("url");
 const eleventyImage = require("../");
@@ -526,43 +525,40 @@ test("Keep a cache, don’t reuse with same file names and different options", a
   t.is(stats2.jpeg.length, 1);
 });
 
-// These tests fail on Windows, maybe due to Window Defender?
-if(os.platform() !== "win32") {
-  test("Keep a cache, don’t reuse with if the image changes, check promise equality", async t => {
-    fs.copyFileSync("./test/modify-bio-original.jpg", "./test/generated-modify-bio.jpg");
+test("Keep a cache, don’t reuse with if the image changes, check promise equality", async t => {
+  fs.copyFileSync("./test/modify-bio-original.jpg", "./test/generated-modify-bio.jpg");
 
-    let promise1 = eleventyImage("./test/generated-modify-bio.jpg", {
-      outputDir: "./test/img/",
-    });
-
-    fs.copyFileSync("./test/modify-bio-grayscale.jpg", "./test/generated-modify-bio.jpg");
+  let promise1 = eleventyImage("./test/generated-modify-bio.jpg", {
+    outputDir: "./test/img/",
+  });
 
-    let promise2 = eleventyImage("./test/generated-modify-bio.jpg", {
-      outputDir: "./test/img/",
-    });
+  fs.copyFileSync("./test/modify-bio-grayscale.jpg", "./test/generated-modify-bio.jpg");
 
-    t.not(promise1, promise2);
+  let promise2 = eleventyImage("./test/generated-modify-bio.jpg", {
+    outputDir: "./test/img/",
   });
 
-  test("Keep a cache, don’t reuse with if the image changes, check output", async t => {
-    fs.copyFileSync("./test/modify2-bio-original.jpg", "./test/generated-modify2-bio.jpg");
-
-    let stats1 = await eleventyImage("./test/generated-modify2-bio.jpg", {
-      outputDir: "./test/img/",
-    });
+  t.not(promise1, promise2);
+});
 
-    fs.copyFileSync("./test/modify2-bio-grayscale.jpg", "./test/generated-modify2-bio.jpg");
+test("Keep a cache, don’t reuse with if the image changes, check output", async t => {
+  fs.copyFileSync("./test/modify2-bio-original.jpg", "./test/generated-modify2-bio.jpg");
 
-    let stats2 = await eleventyImage("./test/generated-modify2-bio.jpg", {
-      outputDir: "./test/img/",
-    });
+  let stats1 = await eleventyImage("./test/generated-modify2-bio.jpg", {
+    outputDir: "./test/img/",
+  });
 
-    t.notDeepEqual(stats1, stats2);
+  fs.copyFileSync("./test/modify2-bio-grayscale.jpg", "./test/generated-modify2-bio.jpg");
 
-    t.is(stats1.jpeg.length, 1);
-    t.is(stats2.jpeg.length, 1);
+  let stats2 = await eleventyImage("./test/generated-modify2-bio.jpg", {
+    outputDir: "./test/img/",
   });
-}
+
+  t.notDeepEqual(stats1, stats2);
+
+  t.is(stats1.jpeg.length, 1);
+  t.is(stats2.jpeg.length, 1);
+});
 
 test("SVG to Buffer input! Issue #40", async t => {
   let svgContent = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 1569.4 2186" xml:space="preserve" aria-hidden="true" focusable="false"><style>.st0{fill:#fff;stroke:#fff;stroke-width:28;stroke-miterlimit:10}</style><g><path class="st0" d="M562.2 1410.1c-9 0-13.5-12-13.5-36.1V778.9c0-11.5-2.3-16.9-7-16.2-28.4 7.2-42.7 10.8-43.1 10.8-7.9.7-11.8-7.2-11.8-23.7v-51.7c0-14.3 4.3-22.4 12.9-24.2l142.2-36.6c1.1-.3 2.7-.5 4.8-.5 7.9 0 11.8 8.4 11.8 25.3v712c0 24.1-4.7 36.1-14 36.1l-82.3-.1zM930.5 1411.2c-14.4 0-26.8-1-37.4-3-10.6-2-21.6-6.5-33.1-13.5s-20.9-16.6-28.3-28.8-13.4-29.3-18-51.2-7-47.9-7-78.1V960.4c0-7.2-2-10.8-5.9-10.8h-33.4c-9 0-13.5-8.6-13.5-25.8v-29.1c0-17.6 4.5-26.4 13.5-26.4h33.4c3.9 0 5.9-4.8 5.9-14.5l9.7-209.5c1.1-19 5.7-28.5 14-28.5h53.9c9 0 13.5 9.5 13.5 28.5v209.5c0 9.7 2.1 14.5 6.5 14.5H973c9 0 13.5 8.8 13.5 26.4v29.1c0 17.2-4.5 25.8-13.5 25.8h-68.9c-2.5 0-4.2.6-5.1 1.9-.9 1.2-1.3 4.2-1.3 8.9v277.9c0 20.8 1.3 38.2 4 52s6.6 24 11.8 30.4 10.4 10.8 15.6 12.9c5.2 2.2 11.6 3.2 19.1 3.2h38.2c9.7 0 14.5 6.7 14.5 19.9v32.3c0 14.7-5.2 22.1-15.6 22.1l-54.8.1zM1137.2 1475.8c8.2 0 15.4-6.7 21.5-20.2s9.2-32.6 9.2-57.4c0-5.8-3.6-25.7-10.8-59.8l-105.6-438.9c-.7-5-1.1-9-1.1-11.9 0-12.9 2.7-19.4 8.1-19.4h65.2c5 0 9.1 1.7 12.4 5.1s5.8 10.3 7.5 20.7l70 370.5c1.4 4.3 2.3 6.5 2.7 6.5 1.4 0 2.2-2 2.2-5.9l54.9-369.5c1.4-10.8 3.7-18 6.7-21.8s6.9-5.7 11.6-5.7h45.2c6.1 0 9.2 7 9.2 21 0 3.2-.4 7.4-1.1 12.4l-95.9 499.3c-7.5 41.3-15.8 72.9-24.8 94.8s-19 36.8-30.2 44.7c-11.1 7.9-25.8 12-44.2 12.4h-5.4c-29.1 0-48.8-7.7-59.2-23.2-2.9-3.2-4.3-11.5-4.3-24.8 0-26.6 4.3-39.9 12.9-39.9.7 0 7.2 1.8 19.4 5.4 12.4 3.8 20.3 5.6 23.9 5.6z"/><g><path class="st0" d="M291.2 1411.1c-9 0-13.5-12-13.5-36.1V779.9c0-11.5-2.3-16.9-7-16.2-28.4 7.2-42.7 10.8-43.1 10.8-7.9.7-11.8-7.2-11.8-23.7v-51.7c0-14.3 4.3-22.4 12.9-24.2L371 638.2c1.1-.3 2.7-.5 4.8-.5 7.9 0 11.8 8.4 11.8 25.3v712c0 24.1-4.7 36.1-14 36.1h-82.4z"/></g></g></svg>`;