Release build 4.23.0 [ci release]

Author: jonathanKingston

.eslintrc

@@ -17,6 +17,13 @@
         "windowsInteropRemoveEventListener": "readonly"
     },
     "rules": {
+        "no-restricted-syntax": [
+            "error",
+            {
+                "selector": "MethodDefinition[key.type='PrivateIdentifier']",
+                "message": "Private methods are currently unsupported in older WebKit and ESR Firefox"
+            }
+        ],
         "indent": ["error", 4],
         "require-await": ["error"],
         "promise/prefer-await-to-then": ["error"],

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
 
       - name: Collect commit ranges
         run: |
-          echo "CHANGELOG=$(git log main --since "$(git show -s --format=%ci $(git rev-list --tags --max-count=1))" --pretty='format:- %s')" >> $GITHUB_OUTPUT
+          echo "CHANGELOG=$(bash ./scripts/changelog.sh)" >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: softprops/action-gh-release@v1

Sources/ContentScopeScripts/dist/contentScope.js

@@ -911,8 +911,7 @@
     function _typeof$1(obj) { "@babel/helpers - typeof"; return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof$1(obj); }
     /**
      * Test deep equality of two JSON values, objects, or arrays
-     */
-    // TODO: write unit tests
+     */ // TODO: write unit tests
     function isEqual(a, b) {
       // FIXME: this function will return false for two objects with the same keys
       //  but different order of keys

Sources/ContentScopeScripts/dist/contentScopeIsolated.js

@@ -495,8 +495,7 @@
     function _typeof$1(obj) { "@babel/helpers - typeof"; return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof$1(obj); }
     /**
      * Test deep equality of two JSON values, objects, or arrays
-     */
-    // TODO: write unit tests
+     */ // TODO: write unit tests
     function isEqual(a, b) {
       // FIXME: this function will return false for two objects with the same keys
       //  but different order of keys

Sources/ContentScopeScripts/dist/pages/duckplayer/index.html

@@ -314,22 +314,15 @@
 <script>
 "use strict";
 (() => {
-  var __defProp = Object.defineProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
-
   // ../messaging/lib/windows.js
   var WindowsMessagingTransport = class {
+    config;
     /**
      * @param {WindowsMessagingConfig} config
      * @param {import('../index.js').MessagingContext} messagingContext
      * @internal
      */
     constructor(config, messagingContext) {
-      __publicField(this, "config");
       this.messagingContext = messagingContext;
       this.config = config;
       this.globals = {
@@ -596,23 +589,15 @@
 
   // ../messaging/lib/webkit.js
   var WebkitMessagingTransport = class {
+    /** @type {WebkitMessagingConfig} */
+    config;
+    /** @internal */
+    globals;
     /**
      * @param {WebkitMessagingConfig} config
      * @param {import('../index.js').MessagingContext} messagingContext
      */
     constructor(config, messagingContext) {
-      /** @type {WebkitMessagingConfig} */
-      __publicField(this, "config");
-      /** @internal */
-      __publicField(this, "globals");
-      /**
-       * @type {{name: string, length: number}}
-       * @internal
-       */
-      __publicField(this, "algoObj", {
-        name: "AES-GCM",
-        length: 256
-      });
       this.messagingContext = messagingContext;
       this.config = config;
       this.globals = captureGlobals();
@@ -745,6 +730,14 @@
     createRandMethodName() {
       return "_" + this.randomString();
     }
+    /**
+     * @type {{name: string, length: number}}
+     * @internal
+     */
+    algoObj = {
+      name: "AES-GCM",
+      length: 256
+    };
     /**
      * @returns {Promise<Uint8Array>}
      * @internal
@@ -1151,7 +1144,7 @@
   }
 
   // ../../src/dom-utils.js
-  var Template = class {
+  var Template = class _Template {
     constructor(strings, values) {
       this.values = values;
       this.strings = strings;
@@ -1179,7 +1172,7 @@
         if (value instanceof Array) {
           return value.map((val) => this.potentiallyEscape(val)).join("");
         }
-        if (value instanceof Template) {
+        if (value instanceof _Template) {
           return value;
         }
         throw new Error("Unknown object to escape");

Sources/ContentScopeScripts/dist/pages/duckplayer/js/index.js

@@ -1,21 +1,14 @@
 "use strict";
 (() => {
-  var __defProp = Object.defineProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
-
   // ../messaging/lib/windows.js
   var WindowsMessagingTransport = class {
+    config;
     /**
      * @param {WindowsMessagingConfig} config
      * @param {import('../index.js').MessagingContext} messagingContext
      * @internal
      */
     constructor(config, messagingContext) {
-      __publicField(this, "config");
       this.messagingContext = messagingContext;
       this.config = config;
       this.globals = {
@@ -282,23 +275,15 @@
 
   // ../messaging/lib/webkit.js
   var WebkitMessagingTransport = class {
+    /** @type {WebkitMessagingConfig} */
+    config;
+    /** @internal */
+    globals;
     /**
      * @param {WebkitMessagingConfig} config
      * @param {import('../index.js').MessagingContext} messagingContext
      */
     constructor(config, messagingContext) {
-      /** @type {WebkitMessagingConfig} */
-      __publicField(this, "config");
-      /** @internal */
-      __publicField(this, "globals");
-      /**
-       * @type {{name: string, length: number}}
-       * @internal
-       */
-      __publicField(this, "algoObj", {
-        name: "AES-GCM",
-        length: 256
-      });
       this.messagingContext = messagingContext;
       this.config = config;
       this.globals = captureGlobals();
@@ -431,6 +416,14 @@
     createRandMethodName() {
       return "_" + this.randomString();
     }
+    /**
+     * @type {{name: string, length: number}}
+     * @internal
+     */
+    algoObj = {
+      name: "AES-GCM",
+      length: 256
+    };
     /**
      * @returns {Promise<Uint8Array>}
      * @internal
@@ -837,7 +830,7 @@
   }
 
   // ../../src/dom-utils.js
-  var Template = class {
+  var Template = class _Template {
     constructor(strings, values) {
       this.values = values;
       this.strings = strings;
@@ -865,7 +858,7 @@
         if (value instanceof Array) {
           return value.map((val) => this.potentiallyEscape(val)).join("");
         }
-        if (value instanceof Template) {
+        if (value instanceof _Template) {
           return value;
         }
         throw new Error("Unknown object to escape");

build/android/contentScope.js

@@ -928,8 +928,7 @@
     function _typeof$1(obj) { "@babel/helpers - typeof"; return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof$1(obj); }
     /**
      * Test deep equality of two JSON values, objects, or arrays
-     */
-    // TODO: write unit tests
+     */ // TODO: write unit tests
     function isEqual(a, b) {
       // FIXME: this function will return false for two objects with the same keys
       //  but different order of keys
@@ -8645,12 +8644,12 @@
              * Create the Facebook login button
              * @type {HTMLDivElement}
              */
-            const loginButton = this.#createLoginButton();
+            const loginButton = this._createLoginButton();
 
             /**
              * Setup the click handlers
              */
-            this.#setupEventListeners(loginButton);
+            this._setupEventListeners(loginButton);
 
             /**
              * Append both to the shadow root
@@ -8679,10 +8678,10 @@
          * proceed.
          * @returns {HTMLDivElement}
          */
-        #createLoginButton () {
+        _createLoginButton () {
             const { label, hoverText, logoIcon, learnMore } = this.params;
 
-            const { popoverStyle, arrowStyle } = this.#calculatePopoverPosition();
+            const { popoverStyle, arrowStyle } = this._calculatePopoverPosition();
 
             const container = document.createElement('div');
             // Add our own styles and inherit any local class styles on the button
@@ -8736,7 +8735,7 @@
          *  arrowStyle: string,   // CSS styles to be applied in the Popover arrow
          * }}
          */
-        #calculatePopoverPosition () {
+        _calculatePopoverPosition () {
             const { originalElement } = this.params;
             const rect = originalElement.getBoundingClientRect();
             const textBubbleWidth = 360; // Should match the width rule in .ddg-popover
@@ -8770,7 +8769,7 @@
          *
          * @param {HTMLElement} loginButton
          */
-        #setupEventListeners (loginButton) {
+        _setupEventListeners (loginButton) {
             const { originalElement, onClick } = this.params;
 
             loginButton
@@ -9284,6 +9283,12 @@
             // If this is a login button, show modal if needed
             if (this.replaceSettings.type === 'loginButton' && entityData[this.entity].shouldShowLoginModal) {
                 return e => {
+                    // Even if the user cancels the login attempt, consider Facebook Click to
+                    // Load to have been active on the page if the user reports the page as broken.
+                    if (this.entity === 'Facebook, Inc.') {
+                        notifyFacebookLogin();
+                    }
+
                     handleUnblockConfirmation(
                         this.platform.name, this.entity, handleClick, e
                     );
@@ -9437,6 +9442,7 @@
 
         // Facebook
         if (widget.replaceSettings.type === 'dialog') {
+            ctl.messaging.notify('updateFacebookCTLBreakageFlags', { ctlFacebookPlaceholderShown: true });
             if (widget.shouldUseCustomElement()) {
                 /**
                  * Creates a custom HTML element with the placeholder element for blocked
@@ -9703,13 +9709,26 @@
         }
     }
 
+    /**
+     * Set the ctlFacebookLogin breakage flag for the page, to indicate that the
+     * Facebook Click to Load login flow had started if the user should then report
+     * the website as broken.
+     */
+    function notifyFacebookLogin () {
+        ctl.messaging.notify('updateFacebookCTLBreakageFlags', { ctlFacebookLogin: true });
+    }
+
     /**
      * Unblock the entity, close the login dialog and continue the Facebook login
      * flow. Called after the user clicks to proceed after the warning dialog is
      * shown.
      * @param {string} entity
      */
     async function runLogin (entity) {
+        if (entity === 'Facebook, Inc.') {
+            notifyFacebookLogin();
+        }
+
         const action = entity === 'Youtube' ? 'block-ctl-yt' : 'block-ctl-fb';
         const response = await unblockClickToLoadContent({ entity, action, isLogin: true, isSurrogateLogin: true });
         // If user rejected confirmation modal and content was not unblocked, inform surrogate and stop.
@@ -10626,6 +10645,12 @@
                 }
                 // Handle login call
                 if (event.detail?.action === 'login') {
+                    // Even if the user cancels the login attempt, consider Facebook Click to
+                    // Load to have been active on the page if the user reports the page as broken.
+                    if (entity === 'Facebook, Inc.') {
+                        notifyFacebookLogin();
+                    }
+
                     if (entityData[entity].shouldShowLoginModal) {
                         handleUnblockConfirmation(this.platform.name, entity, runLogin, entity);
                     } else {
@@ -10904,7 +10929,8 @@
         'openShareFeedbackPage',
         'setYoutubePreviewsEnabled',
         'unblockClickToLoadContent',
-        'updateYouTubeCTLAddedFlag'
+        'updateYouTubeCTLAddedFlag',
+        'updateFacebookCTLBreakageFlags'
     ];
 
     function initCode () {