From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 toolkit/components/normandy/lib/AddonStudies.sys.mjs          | 2 +-
 toolkit/components/normandy/lib/LegacyHeartbeat.sys.mjs       | 1 +
 toolkit/components/normandy/lib/PreferenceExperiments.sys.mjs | 4 ++--
 toolkit/components/normandy/lib/RecipeRunner.sys.mjs          | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'toolkit/components/normandy/lib')

diff --git a/toolkit/components/normandy/lib/AddonStudies.sys.mjs b/toolkit/components/normandy/lib/AddonStudies.sys.mjs
index 202bf8ccb3..e13d470bd7 100644
--- a/toolkit/components/normandy/lib/AddonStudies.sys.mjs
+++ b/toolkit/components/normandy/lib/AddonStudies.sys.mjs
@@ -162,7 +162,7 @@ export var AddonStudies = {
   },
 
   /**
-   * These migrations should only be called from `NormandyMigrations.jsm` and
+   * These migrations should only be called from `NormandyMigrations.sys.mjs` and
    * tests.
    */
   migrations: {
diff --git a/toolkit/components/normandy/lib/LegacyHeartbeat.sys.mjs b/toolkit/components/normandy/lib/LegacyHeartbeat.sys.mjs
index 501c9f70af..93c24faf5d 100644
--- a/toolkit/components/normandy/lib/LegacyHeartbeat.sys.mjs
+++ b/toolkit/components/normandy/lib/LegacyHeartbeat.sys.mjs
@@ -43,6 +43,7 @@ export const LegacyHeartbeat = {
       capabilities: ["action.show-heartbeat"],
       filter_expression: "true",
       use_only_baseline_capabilities: true,
+      revision_id: "1", // Required for the Heartbeat telemetry ping.
     };
   },
 };
diff --git a/toolkit/components/normandy/lib/PreferenceExperiments.sys.mjs b/toolkit/components/normandy/lib/PreferenceExperiments.sys.mjs
index c89beff978..92c5e63076 100644
--- a/toolkit/components/normandy/lib/PreferenceExperiments.sys.mjs
+++ b/toolkit/components/normandy/lib/PreferenceExperiments.sys.mjs
@@ -244,7 +244,7 @@ export var PreferenceExperiments = {
     const defaultBranchPrefs = allExperiments
       .flatMap(exp => Object.entries(exp.preferences))
       .filter(
-        ([preferenceName, preferenceInfo]) =>
+        ([, preferenceInfo]) =>
           preferenceInfo.preferenceBranchType === "default"
       );
     for (const [preferenceName, { preferenceValue }] of defaultBranchPrefs) {
@@ -906,7 +906,7 @@ export var PreferenceExperiments = {
   InvalidPreferenceName: class extends Error {},
 
   /**
-   * These migrations should only be called from `NormandyMigrations.jsm` and tests.
+   * These migrations should only be called from `NormandyMigrations.sys.mjs` and tests.
    */
   migrations: {
     /** Move experiments into a specific key. */
diff --git a/toolkit/components/normandy/lib/RecipeRunner.sys.mjs b/toolkit/components/normandy/lib/RecipeRunner.sys.mjs
index 7e02a3150a..f9578b37d2 100644
--- a/toolkit/components/normandy/lib/RecipeRunner.sys.mjs
+++ b/toolkit/components/normandy/lib/RecipeRunner.sys.mjs
@@ -63,13 +63,13 @@ ChromeUtils.defineLazyGetter(lazy, "gRemoteSettingsClient", () => {
 function cacheProxy(target) {
   const cache = new Map();
   return new Proxy(target, {
-    get(target, prop, receiver) {
+    get(target, prop) {
       if (!cache.has(prop)) {
         cache.set(prop, target[prop]);
       }
       return cache.get(prop);
     },
-    set(target, prop, value, receiver) {
+    set(target, prop, value) {
       cache.set(prop, value);
       return true;
     },
-- 
cgit v1.2.3