Merge pull request #9446 from camptocamp/renovate/master-puppeteer-22.x

Update dependency puppeteer to v22 (master)
camptocamp · Aug 27, 2024 · abf7d0d · abf7d0d
2 parents e87a0b6 + 9358f27
commit abf7d0d
Show file tree

Hide file tree

Showing 76 changed files with 34 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -291,6 +291,7 @@ contribs/dist: .build/build-dll.timestamp
 	python3 -m http.server 3001 &
 	touch $@
 
+# Add --generate as argument to buildtools/check-example to regenerate the reference images
 .build/%.check.timestamp: .build/examples-ngeo.timestamp \
 		.build/node_modules.timestamp \
 		.build/httpserver.timestamp
@@ -309,6 +310,7 @@ contribs/dist: .build/build-dll.timestamp
 	! buildtools/check-example .build/examples-hosted/error.html.png examples/error-ref.png
 	touch $@
 
+# Add --generate as argument to buildtools/check-example to regenerate the reference images
 .build/contribs/gmf/%.check.timestamp: .build/examples-gmf.timestamp \
 		.build/node_modules.timestamp \
 		.build/httpserver.timestamp
@@ -318,6 +320,7 @@ contribs/dist: .build/build-dll.timestamp
 	buildtools/check-example .build/examples-hosted/contribs/gmf/$*.html.png contribs/gmf/examples/$*-ref.png
 	touch $@
 
+# Add --generate as argument to buildtools/check-example to regenerate the reference images
 .build/contribs/gmf/apps/%.check.timestamp: .build/gmf-apps.timestamp \
 		.build/httpserver.timestamp
 	mkdir -p $(dir $@)

diff --git a/buildtools/check-example b/buildtools/check-example
@@ -21,6 +21,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import argparse
 import os
 import shutil
 import subprocess
@@ -42,8 +43,14 @@ def main():
     Optional mask image (name from Reference image): examples/simple-mask.png
     Generate diff image (name from Generated image): .build/examples-hosted/simple-diff.png
     """
-    current = sys.argv[1]
-    ref = sys.argv[2]
+    parser = argparse.ArgumentParser(description=main.__doc__)
+    parser.add_argument("--generate", action="store_true", help="Regenerate the ref image")
+    parser.add_argument("current", help="The current image")
+    parser.add_argument("ref", help="The reference image")
+    args = parser.parse_args()
+
+    current = args.current
+    ref = args.ref
     mask = ref.replace("-ref", "-mask")
     diff = current.replace(".html.png", "-diff.png")
     old_ref = ref
@@ -56,12 +63,10 @@ def main():
         subprocess.run(["gm", "composite", "-compose", "Multiply", old_current, mask, current], check=True)
         subprocess.run(["gm", "composite", "-compose", "Multiply", old_ref, mask, ref], check=True)
 
-    # Set to True to regenerate ref images
-    if False:
-        if "/error-" not in ref:
-            shutil.copyfile(current, old_ref)
-            shutil.copyfile(current, ref)
-            sys.exit(0)
+    if args.generate and "/error-" not in ref:
+        shutil.copyfile(current, old_ref)
+        shutil.copyfile(current, ref)
+        sys.exit(0)
     result = subprocess.run(
         [
             "gm",

diff --git a/buildtools/check-example.js b/buildtools/check-example.js
@@ -189,14 +189,18 @@ function loaded(page, browser) {
           request.headers().origin = 'http://localhost:3001';
         }
         console.log(`Request: ${url}`);
-        request.continue({
-          url,
-          headers: {
-            // Don't be intranet
-            'Forwarded': 'for=8.8.8.8;proto=https',
-            'Cache-Control': 'no-cache',
-          },
-        });
+        if (url.startsWith('http://localhost:') && url.endsWith('/favicon.ico')) {
+          request.respond(OSMImage);
+        } else {
+          request.continue({
+            url,
+            headers: {
+              // Don't be intranet
+              'Forwarded': 'for=8.8.8.8;proto=https',
+              'Cache-Control': 'no-cache',
+            },
+          });
+        }
       }
     } else if (
       url.includes('tile.openstreetmap.org') ||
@@ -268,7 +272,11 @@ function loaded(page, browser) {
         console.log(`Console ${type}`);
         console.log(`On: ${location.url} ${location.lineNumber}:${location.columnNumber}.`);
         console.log(message.text());
-        if (!message.text().includes('CORS')) {
+        if (
+          !message.text().includes('CORS') &&
+          !message.text().includes('Driver Message') &&
+          !message.text().includes('Password field is not contained in a form')
+        ) {
           await browser.close();
           process.exit(2);
         }

diff --git a/contribs/gmf/apps/desktop-ref.png b/contribs/gmf/apps/desktop-ref.png
diff --git a/contribs/gmf/apps/desktop_alt-ref.png b/contribs/gmf/apps/desktop_alt-ref.png
diff --git a/contribs/gmf/apps/mobile-ref.png b/contribs/gmf/apps/mobile-ref.png
diff --git a/contribs/gmf/apps/mobile_alt-ref.png b/contribs/gmf/apps/mobile_alt-ref.png
diff --git a/contribs/gmf/apps/oeedit-ref.png b/contribs/gmf/apps/oeedit-ref.png
diff --git a/contribs/gmf/examples/backgroundlayerselector-ref.png b/contribs/gmf/examples/backgroundlayerselector-ref.png
diff --git a/contribs/gmf/examples/contextualdata-ref.png b/contribs/gmf/examples/contextualdata-ref.png
diff --git a/contribs/gmf/examples/datepicker-ref.png b/contribs/gmf/examples/datepicker-ref.png
diff --git a/contribs/gmf/examples/displayquerygrid-ref.png b/contribs/gmf/examples/displayquerygrid-ref.png
diff --git a/contribs/gmf/examples/displayquerywindow-ref.png b/contribs/gmf/examples/displayquerywindow-ref.png
diff --git a/contribs/gmf/examples/drawfeature-ref.png b/contribs/gmf/examples/drawfeature-ref.png
diff --git a/contribs/gmf/examples/elevation-ref.png b/contribs/gmf/examples/elevation-ref.png
diff --git a/contribs/gmf/examples/featurestyle-ref.png b/contribs/gmf/examples/featurestyle-ref.png
diff --git a/contribs/gmf/examples/importdatasource-ref.png b/contribs/gmf/examples/importdatasource-ref.png
diff --git a/contribs/gmf/examples/layertree-ref.png b/contribs/gmf/examples/layertree-ref.png
diff --git a/contribs/gmf/examples/layertreeadd-ref.png b/contribs/gmf/examples/layertreeadd-ref.png
diff --git a/contribs/gmf/examples/mobilemeasure-ref.png b/contribs/gmf/examples/mobilemeasure-ref.png
diff --git a/contribs/gmf/examples/mouseposition-ref.png b/contribs/gmf/examples/mouseposition-ref.png
diff --git a/contribs/gmf/examples/objectediting-ref.png b/contribs/gmf/examples/objectediting-ref.png
diff --git a/contribs/gmf/examples/objecteditinghub-ref.png b/contribs/gmf/examples/objecteditinghub-ref.png
diff --git a/contribs/gmf/examples/permalink-ref.png b/contribs/gmf/examples/permalink-ref.png
diff --git a/contribs/gmf/examples/print-ref.png b/contribs/gmf/examples/print-ref.png
diff --git a/contribs/gmf/examples/profile-ref.png b/contribs/gmf/examples/profile-ref.png
diff --git a/contribs/gmf/examples/search-ref.png b/contribs/gmf/examples/search-ref.png
diff --git a/contribs/gmf/examples/share-ref.png b/contribs/gmf/examples/share-ref.png
diff --git a/contribs/gmf/examples/simple-ref.png b/contribs/gmf/examples/simple-ref.png
diff --git a/contribs/gmf/examples/themeselector-ref.png b/contribs/gmf/examples/themeselector-ref.png
diff --git a/contribs/gmf/examples/timeslider-ref.png b/contribs/gmf/examples/timeslider-ref.png
diff --git a/contribs/gmf/examples/wfspermalink-ref.png b/contribs/gmf/examples/wfspermalink-ref.png
diff --git a/contribs/gmf/examples/xsdattributes-ref.png b/contribs/gmf/examples/xsdattributes-ref.png
diff --git a/examples/animation-ref.png b/examples/animation-ref.png
diff --git a/examples/asitvd-ref.png b/examples/asitvd-ref.png
diff --git a/examples/attributes-ref.png b/examples/attributes-ref.png
diff --git a/examples/backgroundlayer-ref.png b/examples/backgroundlayer-ref.png
diff --git a/examples/backgroundlayerdropdown-ref.png b/examples/backgroundlayerdropdown-ref.png
diff --git a/examples/colorpicker-ref.png b/examples/colorpicker-ref.png
diff --git a/examples/control-ref.png b/examples/control-ref.png
diff --git a/examples/createfeature-ref.png b/examples/createfeature-ref.png
diff --git a/examples/datepicker-ref.png b/examples/datepicker-ref.png
diff --git a/examples/datetimepicker-ref.png b/examples/datetimepicker-ref.png
diff --git a/examples/disclaimer-ref.png b/examples/disclaimer-ref.png
diff --git a/examples/displaywindow-ref.png b/examples/displaywindow-ref.png
diff --git a/examples/drawfeature-ref.png b/examples/drawfeature-ref.png
diff --git a/examples/elevationProfile-ref.png b/examples/elevationProfile-ref.png
diff --git a/examples/googlestreetview-ref.png b/examples/googlestreetview-ref.png
diff --git a/examples/grid-ref.png b/examples/grid-ref.png
diff --git a/examples/importfeatures-ref.png b/examples/importfeatures-ref.png
diff --git a/examples/interactionbtngroup-ref.png b/examples/interactionbtngroup-ref.png
diff --git a/examples/layerorder-ref.png b/examples/layerorder-ref.png
diff --git a/examples/locationsearch-ref.png b/examples/locationsearch-ref.png
diff --git a/examples/mapfishprint-ref.png b/examples/mapfishprint-ref.png
diff --git a/examples/mapillarystreetview-ref.png b/examples/mapillarystreetview-ref.png
diff --git a/examples/mapswipe-ref.png b/examples/mapswipe-ref.png
diff --git a/examples/mask-ref.png b/examples/mask-ref.png
diff --git a/examples/measure-ref.png b/examples/measure-ref.png
diff --git a/examples/mobilegeolocation-ref.png b/examples/mobilegeolocation-ref.png
diff --git a/examples/modal-ref.png b/examples/modal-ref.png
diff --git a/examples/modifycircle-ref.png b/examples/modifycircle-ref.png
diff --git a/examples/modifyrectangle-ref.png b/examples/modifyrectangle-ref.png
diff --git a/examples/notification-ref.png b/examples/notification-ref.png
diff --git a/examples/permalink-ref.png b/examples/permalink-ref.png
diff --git a/examples/popover-ref.png b/examples/popover-ref.png
diff --git a/examples/popupservice-ref.png b/examples/popupservice-ref.png
diff --git a/examples/query-ref.png b/examples/query-ref.png
diff --git a/examples/recenter-ref.png b/examples/recenter-ref.png
diff --git a/examples/rotate-ref.png b/examples/rotate-ref.png
diff --git a/examples/routing-ref.png b/examples/routing-ref.png
diff --git a/examples/scaleselector-ref.png b/examples/scaleselector-ref.png
diff --git a/examples/search-ref.png b/examples/search-ref.png
diff --git a/examples/simple-ref.png b/examples/simple-ref.png
diff --git a/examples/svg-ref.png b/examples/svg-ref.png
diff --git a/examples/toolActivate-ref.png b/examples/toolActivate-ref.png
diff --git a/package.json b/package.json
@@ -184,7 +184,7 @@
     "ol-mapbox-style": "12.3.5",
     "parse-absolute-css-unit": "1.0.2",
     "proj4": "2.11.0",
-    "puppeteer": "21.11.0",
+    "puppeteer": "22.15.0",
     "qruri": "0.0.4",
     "raw-loader": "4.0.2",
     "react": "18.3.1",