Bump pixelmatch from 6.0.0 to 7.1.0 (#5541)

* Bump pixelmatch from 6.0.0 to 7.1.0 Bumps [pixelmatch](https://github.com/mapbox/pixelmatch) from 6.0.0 to 7.1.0. - [Release notes](https://github.com/mapbox/pixelmatch/releases) - [Commits](mapbox/pixelmatch@v6.0.0...v7.1.0) --- updated-dependencies: - dependency-name: pixelmatch dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update relevant images according to changes in pixelmatch. * Update images according to relevant change * Updated last failing test --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: HarelM <[email protected]>
maplibre · Mar 2, 2025 · 2967387 · 2967387
1 parent 1afc318
commit 2967387
Show file tree

Hide file tree

Showing 56 changed files with 11 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
     "pdf-merger-js": "^5.1.2",
-    "pixelmatch": "^6.0.0",
+    "pixelmatch": "^7.1.0",
     "pngjs": "^7.0.0",
     "postcss": "^8.5.3",
     "postcss-cli": "^11.0.0",

diff --git a/test/integration/render/run_render_tests.ts b/test/integration/render/run_render_tests.ts
@@ -156,11 +156,6 @@ function compareRenderResults(directory: string, testData: TestData, data: Uint8
         throw new Error(`No expected*.png files found as ${dir}; did you mean to run tests with UPDATE=true?`);
     }
 
-    if (process.env.UPDATE) {
-        fs.writeFileSync(expectedPath, PNG.sync.write(actualImg));
-        return;
-    }
-
     // if we have multiple expected images, we'll compare against each one and pick the one with
     // the least amount of difference; this is useful for covering features that render differently
     // depending on platform, i.e. heatmaps use half-float textures for improved rendering where supported
@@ -195,6 +190,11 @@ function compareRenderResults(directory: string, testData: TestData, data: Uint8
     testData.difference = minDiff;
     testData.ok = minDiff <= testData.allowed;
 
+    if (!testData.ok && process.env.UPDATE) {
+        console.log(`Updating ${expectedPath}`);
+        fs.writeFileSync(expectedPath, PNG.sync.write(actualImg));
+    }
+
     testData.expected = minExpectedBuf.toString('base64');
     testData.diff = diffBuf.toString('base64');
 }

diff --git a/.../render/tests/combinations/fill-opaque--fill-extrusion-translucent/expected.png b/.../render/tests/combinations/fill-opaque--fill-extrusion-translucent/expected.png
diff --git a/...ntegration/render/tests/combinations/fill-opaque--line-translucent/expected.png b/...ntegration/render/tests/combinations/fill-opaque--line-translucent/expected.png
diff --git a/...er/tests/combinations/fill-translucent--fill-extrusion-translucent/expected.png b/...er/tests/combinations/fill-translucent--fill-extrusion-translucent/expected.png
diff --git a/test/integration/render/tests/debug/raster/expected.png b/test/integration/render/tests/debug/raster/expected.png
diff --git a/test/integration/render/tests/debug/tile-raster/expected.png b/test/integration/render/tests/debug/tile-raster/expected.png
diff --git a/test/integration/render/tests/debug/tile/expected.png b/test/integration/render/tests/debug/tile/expected.png
diff --git a/test/integration/render/tests/fill-extrusion-pattern/function-2/expected.png b/test/integration/render/tests/fill-extrusion-pattern/function-2/expected.png
diff --git a/test/integration/render/tests/fill-outline-color/fill/expected.png b/test/integration/render/tests/fill-outline-color/fill/expected.png
diff --git a/...gration/render/tests/fill-outline-color/zoom-and-property-function/expected.png b/...gration/render/tests/fill-outline-color/zoom-and-property-function/expected.png
diff --git a/test/integration/render/tests/fill-pattern/case-data-expression/expected.png b/test/integration/render/tests/fill-pattern/case-data-expression/expected.png
diff --git a/test/integration/render/tests/high-pitch/pitch95/expected.png b/test/integration/render/tests/high-pitch/pitch95/expected.png
diff --git a/...ion/render/tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/expected.png b/...ion/render/tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/expected.png
diff --git a/test/integration/render/tests/icon-text-fit/enlargen-width/expected.png b/test/integration/render/tests/icon-text-fit/enlargen-width/expected.png
diff --git a/test/integration/render/tests/icon-text-fit/textFit-grid-long/expected.png b/test/integration/render/tests/icon-text-fit/textFit-grid-long/expected.png
diff --git a/test/integration/render/tests/projection/globe/background-pattern/expected.png b/test/integration/render/tests/projection/globe/background-pattern/expected.png
diff --git a/...on/render/tests/projection/globe/collision-icon-text-translate-map/expected.png b/...on/render/tests/projection/globe/collision-icon-text-translate-map/expected.png
diff --git a/...on/render/tests/projection/globe/collision-text-point-pole-to-pole/expected.png b/...on/render/tests/projection/globe/collision-text-point-pole-to-pole/expected.png
diff --git a/.../render/tests/projection/globe/collision-text-variable-anchor/base/expected.png b/.../render/tests/projection/globe/collision-text-variable-anchor/base/expected.png
diff --git a/...rojection/globe/collision-text-variable-anchor/pitched-and-rotated/expected.png b/...rojection/globe/collision-text-variable-anchor/pitched-and-rotated/expected.png
diff --git a/...nder/tests/projection/globe/collision-text-variable-anchor/rotated/expected.png b/...nder/tests/projection/globe/collision-text-variable-anchor/rotated/expected.png
diff --git a/...integration/render/tests/projection/globe/fill-extrusion-translate/expected.png b/...integration/render/tests/projection/globe/fill-extrusion-translate/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-extrusion/expected.png b/test/integration/render/tests/projection/globe/fill-extrusion/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-planet-pitched/expected.png b/test/integration/render/tests/projection/globe/fill-planet-pitched/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-planet-solid/expected.png b/test/integration/render/tests/projection/globe/fill-planet-solid/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-planet-tiles/expected.png b/test/integration/render/tests/projection/globe/fill-planet-tiles/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-seams/ocean/expected.png b/test/integration/render/tests/projection/globe/fill-seams/ocean/expected.png
diff --git a/test/integration/render/tests/projection/globe/fill-translate/expected.png b/test/integration/render/tests/projection/globe/fill-translate/expected.png
diff --git a/...gration/render/tests/projection/globe/icon-text-translate-viewport/expected.png b/...gration/render/tests/projection/globe/icon-text-translate-viewport/expected.png
diff --git a/test/integration/render/tests/projection/globe/line-gradient/expected.png b/test/integration/render/tests/projection/globe/line-gradient/expected.png
diff --git a/test/integration/render/tests/projection/globe/line-spiral/expected.png b/test/integration/render/tests/projection/globe/line-spiral/expected.png
diff --git a/test/integration/render/tests/projection/globe/line-translate/expected.png b/test/integration/render/tests/projection/globe/line-translate/expected.png
diff --git a/.../integration/render/tests/projection/globe/terrain/atmosphere/base/expected.png b/.../integration/render/tests/projection/globe/terrain/atmosphere/base/expected.png
diff --git a/...r/tests/projection/globe/terrain/collision-text-point-pole-to-pole/expected.png b/...r/tests/projection/globe/terrain/collision-text-point-pole-to-pole/expected.png
diff --git a/...tests/projection/globe/terrain/collision-text-variable-anchor/base/expected.png b/...tests/projection/globe/terrain/collision-text-variable-anchor/base/expected.png
diff --git a/...n/globe/terrain/collision-text-variable-anchor/pitched-and-rotated/expected.png b/...n/globe/terrain/collision-text-variable-anchor/pitched-and-rotated/expected.png
diff --git a/...ts/projection/globe/terrain/collision-text-variable-anchor/rotated/expected.png b/...ts/projection/globe/terrain/collision-text-variable-anchor/rotated/expected.png
diff --git a/...ion/render/tests/projection/globe/terrain/fill-extrusion-translate/expected.png b/...ion/render/tests/projection/globe/terrain/fill-extrusion-translate/expected.png
diff --git a/...integration/render/tests/projection/globe/terrain/fill-planet-pole/expected.png b/...integration/render/tests/projection/globe/terrain/fill-planet-pole/expected.png
diff --git a/...ntegration/render/tests/projection/globe/terrain/fill-planet-tiles/expected.png b/...ntegration/render/tests/projection/globe/terrain/fill-planet-tiles/expected.png
diff --git a/test/integration/render/tests/projection/globe/terrain/hillshade-sky/expected.png b/test/integration/render/tests/projection/globe/terrain/hillshade-sky/expected.png
diff --git a/test/integration/render/tests/projection/globe/terrain/hillshade/expected.png b/test/integration/render/tests/projection/globe/terrain/hillshade/expected.png
diff --git a/test/integration/render/tests/projection/globe/terrain/raster-planet/expected.png b/test/integration/render/tests/projection/globe/terrain/raster-planet/expected.png
diff --git a/...ntegration/render/tests/projection/globe/text-variable-anchor/base/expected.png b/...ntegration/render/tests/projection/globe/text-variable-anchor/base/expected.png
diff --git a/...er/tests/projection/globe/text-variable-anchor/pitched-and-rotated/expected.png b/...er/tests/projection/globe/text-variable-anchor/pitched-and-rotated/expected.png
diff --git a/...gration/render/tests/projection/globe/text-variable-anchor/rotated/expected.png b/...gration/render/tests/projection/globe/text-variable-anchor/rotated/expected.png
diff --git a/test/integration/render/tests/raster-masking/overlapping-zoom/expected.png b/test/integration/render/tests/raster-masking/overlapping-zoom/expected.png
diff --git a/test/integration/render/tests/regressions/mapbox-gl-js#5631/expected.png b/test/integration/render/tests/regressions/mapbox-gl-js#5631/expected.png
diff --git a/test/integration/render/tests/sky/roll45-with-text/expected.png b/test/integration/render/tests/sky/roll45-with-text/expected.png
diff --git a/test/integration/render/tests/terrain/fog/expected.png b/test/integration/render/tests/terrain/fog/expected.png
diff --git a/test/integration/render/tests/terrain/pitched-world/expected.png b/test/integration/render/tests/terrain/pitched-world/expected.png
diff --git a/test/integration/render/tests/terrain/symbol-add-terrain/expected.png b/test/integration/render/tests/terrain/symbol-add-terrain/expected.png
diff --git a/test/integration/render/tests/text-local-ideographs/cjk-symbols/expected.png b/test/integration/render/tests/text-local-ideographs/cjk-symbols/expected.png
diff --git a/test/integration/render/tests/text-local-ideographs/cjk/expected.png b/test/integration/render/tests/text-local-ideographs/cjk/expected.png