Release build 11.30.0 [ci release]

Author: jonathanKingston

CHANGELOG.txt

@@ -1,5 +1 @@
-- Add timeout to enumerateDevices call (#1982)
-- build(deps-dev): bump the eslint group across 1 directory with 2 updates (#1980)
-- build(deps-dev): bump web-ext from 8.9.0 to 8.10.0 (#1978)
-- build(deps): bump esbuild from 0.25.9 to 0.25.10 (#1976)
-- build(deps-dev): bump wait-on from 8.0.5 to 9.0.1 (#1975)
+- Add viewport width fix for legacy bundle (#1981)

build/android/adsjsContentScope.js

@@ -4052,18 +4052,19 @@
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -4526,6 +4527,10 @@
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

build/android/contentScope.js

@@ -6792,18 +6792,19 @@
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -7266,6 +7267,10 @@
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

build/apple/contentScope.js

@@ -4808,18 +4808,19 @@
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -5282,6 +5283,10 @@
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

build/integration/contentScope.js

@@ -16115,18 +16115,19 @@ ${truncatedWarning}
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -16589,6 +16590,10 @@ ${truncatedWarning}
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

build/windows/contentScope.js

@@ -14885,18 +14885,19 @@
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -15359,6 +15360,10 @@
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

injected/integration-test/extension/contentScope.js

@@ -16115,18 +16115,19 @@ ${truncatedWarning}
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -16589,6 +16590,10 @@ ${truncatedWarning}
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

injected/integration-test/test-pages/build/contentScope.js

@@ -16115,18 +16115,19 @@ ${truncatedWarning}
       if (this.getFeatureSettingEnabled("enumerateDevices")) {
         this.deviceEnumerationFix();
       }
+      if (this.getFeatureSettingEnabled("viewportWidthLegacy", "disabled")) {
+        this.viewportWidthFix();
+      }
     }
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
       if (this.getFeatureSettingEnabled("viewportWidth")) {
-        if (!this._viewportWidthFixApplied) {
-          this.viewportWidthFix();
-          this._viewportWidthFixApplied = true;
-        }
+        this.viewportWidthFix();
       }
     }
     /** Shim Web Share API in Android WebView */
@@ -16589,6 +16590,10 @@ ${truncatedWarning}
       };
     }
     viewportWidthFix() {
+      if (this._viewportWidthFixApplied) {
+        return;
+      }
+      this._viewportWidthFixApplied = true;
       if (document.readyState === "loading") {
         document.addEventListener("DOMContentLoaded", () => this.viewportWidthFixInner());
       } else {

injected/src/features/web-compat.js

@@ -141,20 +141,23 @@ export class WebCompat extends ContentFeature {
         if (this.getFeatureSettingEnabled('enumerateDevices')) {
             this.deviceEnumerationFix();
         }
+        // Used by Android in the non adsjs version
+        // This has to be enabled in the config for the injectName='android' now.
+        if (this.getFeatureSettingEnabled('viewportWidthLegacy', 'disabled')) {
+            this.viewportWidthFix();
+        }
     }
 
     /**
      * Handle user preference updates when merged during initialization.
      * Re-applies viewport fixes if viewport configuration has changed.
+     * Used in the injectName='android-adsjs' instead of 'viewportWidthLegacy' from init.
      * @param {object} _updatedConfig - The configuration with merged user preferences
      */
     onUserPreferencesMerged(_updatedConfig) {
         // Re-apply viewport width fix if viewport settings might have changed
         if (this.getFeatureSettingEnabled('viewportWidth')) {
-            if (!this._viewportWidthFixApplied) {
-                this.viewportWidthFix();
-                this._viewportWidthFixApplied = true;
-            }
+            this.viewportWidthFix();
         }
     }
 
@@ -698,6 +701,10 @@ export class WebCompat extends ContentFeature {
     }
 
     viewportWidthFix() {
+        if (this._viewportWidthFixApplied) {
+            return;
+        }
+        this._viewportWidthFixApplied = true;
         if (document.readyState === 'loading') {
             // if the document is not ready, we may miss the original viewport tag
             document.addEventListener('DOMContentLoaded', () => this.viewportWidthFixInner());