Release build 11.4.0 [ci release]

Author: madblex

CHANGELOG.txt

@@ -1,5 +1,8 @@
-- NTP: More omnibar design feedback (#1876)
-- NTP: Remove search icon and input suffix from omnibar, tweak surface colours (#1871)
-- NTP: Swap “Show Duck.ai” / “Hide Duck.ai” link for a Duck.ai toggle (#1870)
-- Add typing method to urlChanged method (#1869)
-- Add screenshot tests for omnibar widget states (#1868)
+- NTP: Omnibar design fixes i2 (#1889)
+- Fix context menu by filtering fake widgets starting with underscore (#1888)
+- build(deps): bump @rive-app/canvas-single from 2.30.4 to 2.31.1 (#1885)
+- build(deps-dev): bump eslint from 9.32.0 to 9.33.0 in the eslint group (#1886)
+- build(deps): bump immutable-json-patch from 6.0.1 to 6.0.2 (#1873)
+- Inject name conditional (#1884)
+- Remove console.log from url-change.js (#1877)
+- Match on frame conditional (#1725)

build/android/autofillPasswordImport.js

@@ -1817,26 +1817,25 @@
         copy2[symbol] = value[symbol];
       });
       return copy2;
-    } else if (isJSONObject(value)) {
+    }
+    if (isJSONObject(value)) {
       const copy2 = {
         ...value
       };
       Object.getOwnPropertySymbols(value).forEach((symbol) => {
         copy2[symbol] = value[symbol];
       });
       return copy2;
-    } else {
-      return value;
     }
+    return value;
   }
   function applyProp(object, key, value) {
     if (object[key] === value) {
       return object;
-    } else {
-      const updatedObject = shallowClone(object);
-      updatedObject[key] = value;
-      return updatedObject;
     }
+    const updatedObject = shallowClone(object);
+    updatedObject[key] = value;
+    return updatedObject;
   }
   function getIn(object, path) {
     let value = object;
@@ -1845,7 +1844,7 @@
       if (isJSONObject(value)) {
         value = value[path[i]];
       } else if (isJSONArray(value)) {
-        value = value[parseInt(path[i])];
+        value = value[Number.parseInt(path[i])];
       } else {
         value = void 0;
       }
@@ -1862,15 +1861,13 @@
     const updatedValue = setIn(object ? object[key] : void 0, path.slice(1), value, createPath);
     if (isJSONObject(object) || isJSONArray(object)) {
       return applyProp(object, key, updatedValue);
-    } else {
-      if (createPath) {
-        const newObject = IS_INTEGER_REGEX.test(key) ? [] : {};
-        newObject[key] = updatedValue;
-        return newObject;
-      } else {
-        throw new Error("Path does not exist");
-      }
     }
+    if (createPath) {
+      const newObject = IS_INTEGER_REGEX.test(key) ? [] : {};
+      newObject[key] = updatedValue;
+      return newObject;
+    }
+    throw new Error("Path does not exist");
   }
   var IS_INTEGER_REGEX = /^\d+$/;
   function updateIn(object, path, transform) {
@@ -1895,16 +1892,15 @@
       const key2 = path[0];
       if (!(key2 in object)) {
         return object;
-      } else {
-        const updatedObject = shallowClone(object);
-        if (isJSONArray(updatedObject)) {
-          updatedObject.splice(parseInt(key2), 1);
-        }
-        if (isJSONObject(updatedObject)) {
-          delete updatedObject[key2];
-        }
-        return updatedObject;
       }
+      const updatedObject = shallowClone(object);
+      if (isJSONArray(updatedObject)) {
+        updatedObject.splice(Number.parseInt(key2), 1);
+      }
+      if (isJSONObject(updatedObject)) {
+        delete updatedObject[key2];
+      }
+      return updatedObject;
     }
     const key = path[0];
     const updatedValue = deleteIn(object[key], path.slice(1));
@@ -1915,10 +1911,10 @@
     const index = path[path.length - 1];
     return updateIn(document2, parentPath, (items) => {
       if (!Array.isArray(items)) {
-        throw new TypeError("Array expected at path " + JSON.stringify(parentPath));
+        throw new TypeError(`Array expected at path ${JSON.stringify(parentPath)}`);
       }
       const updatedItems = shallowClone(items);
-      updatedItems.splice(parseInt(index), 0, value);
+      updatedItems.splice(Number.parseInt(index), 0, value);
       return updatedItems;
     });
   }
@@ -1945,7 +1941,7 @@
     return path.map(compileJSONPointerProp).join("");
   }
   function compileJSONPointerProp(pathProp) {
-    return "/" + String(pathProp).replace(/~/g, "~0").replace(/\//g, "~1");
+    return `/${String(pathProp).replace(/~/g, "~0").replace(/\//g, "~1")}`;
   }
 
   // ../node_modules/immutable-json-patch/lib/esm/immutableJSONPatch.js
@@ -1954,7 +1950,7 @@
     for (let i = 0; i < operations.length; i++) {
       validateJSONPatchOperation(operations[i]);
       let operation = operations[i];
-      if (options && options.before) {
+      if (options?.before) {
         const result = options.before(updatedDocument, operation);
         if (result !== void 0) {
           if (result.document !== void 0) {
@@ -1983,9 +1979,9 @@
       } else if (operation.op === "test") {
         test(updatedDocument, path, operation.value);
       } else {
-        throw new Error("Unknown JSONPatch operation " + JSON.stringify(operation));
+        throw new Error(`Unknown JSONPatch operation ${JSON.stringify(operation)}`);
       }
-      if (options && options.after) {
+      if (options?.after) {
         const result = options.after(updatedDocument, operation, previousDocument);
         if (result !== void 0) {
           updatedDocument = result;
@@ -1995,26 +1991,23 @@
     return updatedDocument;
   }
   function replace(document2, path, value) {
-    return setIn(document2, path, value);
+    return existsIn(document2, path) ? setIn(document2, path, value) : document2;
   }
   function remove(document2, path) {
     return deleteIn(document2, path);
   }
   function add(document2, path, value) {
     if (isArrayItem(document2, path)) {
       return insertAt(document2, path, value);
-    } else {
-      return setIn(document2, path, value);
     }
+    return setIn(document2, path, value);
   }
   function copy(document2, path, from) {
     const value = getIn(document2, from);
     if (isArrayItem(document2, path)) {
       return insertAt(document2, path, value);
-    } else {
-      const value2 = getIn(document2, from);
-      return setIn(document2, path, value2);
     }
+    return setIn(document2, path, value);
   }
   function move(document2, path, from) {
     const value = getIn(document2, from);
@@ -2051,14 +2044,14 @@
   function validateJSONPatchOperation(operation) {
     const ops = ["add", "remove", "replace", "copy", "move", "test"];
     if (!ops.includes(operation.op)) {
-      throw new Error("Unknown JSONPatch op " + JSON.stringify(operation.op));
+      throw new Error(`Unknown JSONPatch op ${JSON.stringify(operation.op)}`);
     }
     if (typeof operation.path !== "string") {
-      throw new Error('Required property "path" missing or not a string in operation ' + JSON.stringify(operation));
+      throw new Error(`Required property "path" missing or not a string in operation ${JSON.stringify(operation)}`);
     }
     if (operation.op === "copy" || operation.op === "move") {
       if (typeof operation.from !== "string") {
-        throw new Error('Required property "from" missing or not a string in operation ' + JSON.stringify(operation));
+        throw new Error(`Required property "from" missing or not a string in operation ${JSON.stringify(operation)}`);
       }
     }
   }
@@ -2887,6 +2880,13 @@
     get featureSettings() {
       return __privateGet(this, _args)?.featureSettings;
     }
+    /**
+     * Getter for injectName, will be overridden by subclasses (namely ContentFeature)
+     * @returns {string | undefined}
+     */
+    get injectName() {
+      return void 0;
+    }
     /**
      * Given a config key, interpret the value as a list of conditionals objects, and return the elements that match the current page
      * Consider in your feature using patchSettings instead as per `getFeatureSetting`.
@@ -2925,6 +2925,10 @@
      * @property {object} [experiment]
      * @property {string} [experiment.experimentName]
      * @property {string} [experiment.cohort]
+     * @property {object} [context]
+     * @property {boolean} [context.frame] - true if the condition applies to frames
+     * @property {boolean} [context.top] - true if the condition applies to the top frame
+     * @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
      */
     /**
      * Takes multiple conditional blocks and returns true if any apply.
@@ -2946,9 +2950,11 @@
     _matchConditionalBlock(conditionBlock) {
       const conditionChecks = {
         domain: this._matchDomainConditional,
+        context: this._matchContextConditional,
         urlPattern: this._matchUrlPatternConditional,
         experiment: this._matchExperimentConditional,
-        minSupportedVersion: this._matchMinSupportedVersion
+        minSupportedVersion: this._matchMinSupportedVersion,
+        injectName: this._matchInjectNameConditional
       };
       for (const key in conditionBlock) {
         if (!conditionChecks[key]) {
@@ -2984,6 +2990,22 @@
         return cohort.feature === "contentScopeExperiments" && cohort.subfeature === experiment.experimentName && cohort.cohort === experiment.cohort;
       });
     }
+    /**
+     * Takes a condition block and returns true if the current context matches the context.
+     * @param {ConditionBlock} conditionBlock
+     * @returns {boolean}
+     */
+    _matchContextConditional(conditionBlock) {
+      if (!conditionBlock.context) return false;
+      const isFrame = window.self !== window.top;
+      if (conditionBlock.context.frame && isFrame) {
+        return true;
+      }
+      if (conditionBlock.context.top && !isFrame) {
+        return true;
+      }
+      return false;
+    }
     /**
      * Takes a condtion block and returns true if the current url matches the urlPattern.
      * @param {ConditionBlock} conditionBlock
@@ -3012,6 +3034,17 @@
       }
       return matchHostname(domain, conditionBlock.domain);
     }
+    /**
+     * Takes a condition block and returns true if the current inject name matches the injectName.
+     * @param {ConditionBlock} conditionBlock
+     * @returns {boolean}
+     */
+    _matchInjectNameConditional(conditionBlock) {
+      if (!conditionBlock.injectName) return false;
+      const currentInjectName = this.injectName;
+      if (!currentInjectName) return false;
+      return conditionBlock.injectName === currentInjectName;
+    }
     /**
      * Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
      * @param {ConditionBlock} conditionBlock
@@ -3889,7 +3922,6 @@
     const historyMethodProxy = new DDGProxy(urlChangedInstance, History.prototype, "pushState", {
       apply(target, thisArg, args) {
         const changeResult = DDGReflect.apply(target, thisArg, args);
-        console.log("pushstate event");
         handleURLChange("push");
         return changeResult;
       }