Bug 1752990 - Import WebCompat Intervention v103 sources.

components/feature/webcompat/src/main/assets/extensions/webcompat/about-compat/aboutPage.js

@@ -4,13 +4,9 @@
 
 "use strict";
 
-/* global ExtensionAPI, Services, XPCOMUtils */
+/* global ExtensionAPI, XPCOMUtils */
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "Services",
-  "resource://gre/modules/Services.jsm"
-);
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(
   this,

components/feature/webcompat/src/main/assets/extensions/webcompat/data/injections.js

@@ -359,20 +359,6 @@ const AVAILABLE_INJECTIONS = [
       allFrames: true,
     },
   },
-  {
-    id: "bug1711082",
-    platform: "all",
-    domain: "m.aliexpress.com",
-    bug: "1711082",
-    contentScripts: {
-      matches: ["*://m.aliexpress.com/*"],
-      js: [
-        {
-          file: "injections/js/bug1711082-m.aliexpress.com-undisable-search.js",
-        },
-      ],
-    },
-  },
   {
     id: "bug1712833",
     platform: "all",
@@ -507,27 +493,18 @@ const AVAILABLE_INJECTIONS = [
       ],
     },
   },
-  {
-    id: "bug1756692",
-    platform: "android",
-    domain: "zee5.com",
-    bug: "1756692",
-    contentScripts: {
-      matches: ["*://www.zee5.com/*"],
-      js: [
-        {
-          file: "injections/js/bug1756692-effectiveType-shim.js",
-        },
-      ],
-    },
-  },
   {
     id: "bug1739489",
     platform: "desktop",
-    domain: "draft.js",
+    domain: "Sites using draft.js",
     bug: "1739489",
     contentScripts: {
-      matches: ["*://draftjs.org/*", "*://www.facebook.com/*"],
+      matches: [
+        "*://draftjs.org/*", // Bug 1739489
+        "*://www.facebook.com/*", // Bug 1739489
+        "*://twitter.com/*", // Bug 1776229
+        "*://mobile.twitter.com/*", // Bug 1776229
+      ],
       js: [
         {
           file: "injections/js/bug1739489-draftjs-beforeinput.js",
@@ -578,6 +555,36 @@ const AVAILABLE_INJECTIONS = [
       ],
     },
   },
+  {
+    id: "bug1774490",
+    platform: "all",
+    domain: "rainews.it",
+    bug: "1774490",
+    contentScripts: {
+      matches: ["*://www.rainews.it/*"],
+      css: [
+        {
+          file: "injections/css/bug1774490-rainews.it-gallery-fix.css",
+        },
+      ],
+    },
+  },
+  {
+    id: "bug1774005",
+    platform: "all",
+    domain: "Sites relying on window.InstallTrigger",
+    bug: "1774005",
+    contentScripts: {
+      matches: [
+        "*://*.pixiv.net/*", // Bug 1774006
+      ],
+      js: [
+        {
+          file: "injections/js/bug1774005-installtrigger-shim.js",
+        },
+      ],
+    },
+  },
 ];
 
 module.exports = AVAILABLE_INJECTIONS;

components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js

@@ -148,6 +148,25 @@ const AVAILABLE_SHIMS = [
     ],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "AdSafeProtectedFavIcon",
+    platform: "all",
+    name: "Ad Safe Protected favicon",
+    bug: "1717806",
+    matches: [
+      {
+        patterns: ["*://static.adsafeprotected.com/favicon.ico"],
+        target: "https://redirect.firefox.etp/adsafeprotected_favicon",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+      {
+        patterns: ["https://redirect.firefox.etp/adsafeprotected_favicon"],
+        target: "tracking-pixel.png",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+    ],
+    onlyIfBlockedByETP: true,
+  },
   {
     id: "AdSafeProtectedGoogleIMAAdapter",
     platform: "all",
@@ -164,7 +183,35 @@ const AVAILABLE_SHIMS = [
     name: "Ads by Google",
     bug: "1713726",
     file: "google-ads.js",
-    matches: ["*://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"],
+    matches: [
+      "*://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js",
+      {
+        patterns: [
+          "*://pagead2.googlesyndication.com/pagead/*.js*fcd=true",
+          "*://pagead2.googlesyndication.com/pagead/js/*.js*fcd=true",
+        ],
+        target: "empty-script.js",
+        types: ["xmlhttprequest"],
+      },
+    ],
+    onlyIfBlockedByETP: true,
+  },
+  {
+    id: "Branch",
+    platform: "all",
+    name: "Branch Web SDK",
+    bug: "1716220",
+    file: "branch.js",
+    matches: ["*://cdn.branch.io/branch-latest.min.js*"],
+    onlyIfBlockedByETP: true,
+  },
+  {
+    id: "DoubleVerify",
+    platform: "all",
+    name: "DoubleVerify",
+    bug: "1771557",
+    file: "doubleverify.js",
+    matches: ["*://pub.doubleverify.com/signals/pub.js*"],
     onlyIfBlockedByETP: true,
   },
   {
@@ -247,6 +294,19 @@ const AVAILABLE_SHIMS = [
     ],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "PBMWebAPIFixes",
+    platform: "all",
+    name: "Private Browsing Web APIs",
+    bug: "1773110",
+    runFirst: "private-browsing-web-api-fixes.js",
+    matches: [
+      "*://*.imgur.com/js/vendor.*.bundle.js",
+      "*://*.imgur.io/js/vendor.*.bundle.js",
+      "*://www.rva311.com/static/js/main.*.chunk.js",
+    ],
+    onlyIfPrivateBrowsing: true,
+  },
   {
     id: "Eluminate",
     platform: "all",
@@ -391,6 +451,15 @@ const AVAILABLE_SHIMS = [
       },
     ],
   },
+  {
+    id: "IAM",
+    platform: "all",
+    name: "INFOnline IAM",
+    bug: "1761774",
+    file: "iam.js",
+    matches: ["*://script.ioam.de/iam.js"],
+    onlyIfBlockedByETP: true,
+  },
   {
     id: "IASPET",
     platform: "all",
@@ -426,13 +495,25 @@ const AVAILABLE_SHIMS = [
     ],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "Nielsen",
+    platform: "all",
+    name: "Nielsen",
+    bug: "1760754",
+    file: "nielsen.js",
+    matches: ["*://*.imrworldwide.com/v60.js"],
+    onlyIfBlockedByETP: true,
+  },
   {
     id: "Optimizely",
     platform: "all",
     name: "Optimizely",
     bug: "1714431",
     file: "optimizely.js",
-    matches: ["*://cdn.optimizely.com/js/*.js"],
+    matches: [
+      "*://cdn.optimizely.com/js/*.js",
+      "*://cdn.optimizely.com/public/*.js",
+    ],
     onlyIfBlockedByETP: true,
   },
   {
@@ -454,6 +535,19 @@ const AVAILABLE_SHIMS = [
     matches: ["*://media.richrelevance.com/rrserver/js/1.2/p13n.js"],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "Firebase",
+    platform: "all",
+    name: "Firebase",
+    bug: "1668408",
+    onlyIfPrivateBrowsing: true,
+    runFirst: "firebase.js",
+    matches: [
+      "*://www.gstatic.com/firebasejs/*/firebase-messaging.js*",
+      "*://orangerie.eu/js/vendor*.js*",
+      "*://web.whatsapp.com/vendor*bootstrap_qr*.js*",
+    ],
+  },
   {
     id: "StackBlitz",
     platform: "all",
@@ -469,6 +563,28 @@ const AVAILABLE_SHIMS = [
       },
     ],
   },
+  {
+    id: "StickyAdsTV",
+    platform: "all",
+    name: "StickyAdsTV",
+    bug: "1717806",
+    matches: [
+      {
+        patterns: [
+          "*://ads.stickyadstv.com/auto-user-sync*",
+          "*://ads.stickyadstv.com/user-matching*",
+        ],
+        target: "https://redirect.firefox.etp/stickadstv",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+      {
+        patterns: ["https://redirect.firefox.etp/stickadstv"],
+        target: "tracking-pixel.png",
+        types: ["image", "imageset", "xmlhttprequest"],
+      },
+    ],
+    onlyIfBlockedByETP: true,
+  },
   {
     id: "Vidible",
     branch: ["nightly"],

components/feature/webcompat/src/main/assets/extensions/webcompat/data/ua_overrides.js

@@ -716,6 +716,7 @@ const AVAILABLE_UA_OVERRIDES = [
       matches: [
         "*://*.commerzbank.de/*", // Bug 1767630
         "*://*.edf.com/*", // Bug 1764786
+        "*://*.ibmserviceengage.com/*", // #105438
         "*://*.wordpress.org/*", // Bug 1743431
         "*://as.eservice.asus.com/*", // #104113
         "*://bethesda.net/*", // #94607,
@@ -726,6 +727,7 @@ const AVAILABLE_UA_OVERRIDES = [
         "*://mon.allianzbanque.fr/*", // #101074
         "*://online.citi.com/*", // #101268
         "*://simperium.com/*", // #98934
+        "*://survey.sogosurvey.com/*", // Bug 1765925
         "*://ubank.com.au/*", // #104099
         "*://wifi.sncf/*", // #100194
         "*://www.accringtonobserver.co.uk/*", // Bug 1762928 (Reach Plc)
@@ -789,6 +791,7 @@ const AVAILABLE_UA_OVERRIDES = [
         "*://www.leeds-live.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.leicestermercury.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.lincolnshirelive.co.uk/*", // Bug 1762928 (Reach Plc)
+        "*://www.liveobserverpark.com/*", // #105244
         "*://www.liverpool.com/*", // Bug 1762928 (Reach Plc)
         "*://www.liverpoolecho.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.loughboroughecho.net/*", // Bug 1762928 (Reach Plc)
@@ -811,7 +814,6 @@ const AVAILABLE_UA_OVERRIDES = [
         "*://www.southportvisiter.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.staffordshire-live.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.stokesentinel.co.uk/*", // Bug 1762928 (Reach Plc)
-        "*://survey.sogosurvey.com/*", // Bug 1765925
         "*://www.sussexlive.co.uk/*", // Bug 1762928 (Reach Plc)
         "*://www.tm-awx.com/*", // Bug 1762928 (Reach Plc)
         "*://www.walesonline.co.uk/*", // Bug 1762928 (Reach Plc)

components/feature/webcompat/src/main/assets/extensions/webcompat/injections/css/bug1774490-rainews.it-gallery-fix.css

@@ -0,0 +1,9 @@
+/**
+ * rainews.it - Image slideshow is not shown
+ * Bug #1774490 - https://bugzilla.mozilla.org/show_bug.cgi?id=1774490
+ * WebCompat issue #105402 - https://webcompat.com/issues/105402
+ */
+
+.photogallery-swiper .swiper-slide {
+  height: auto;
+}