Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 17 insertions, 9 deletions

diff --git a/devtools/client/application/initializer.js b/devtools/client/application/initializer.js
index fbfcbc1edc..c431945bf0 100644
--- a/devtools/client/application/initializer.js
+++ b/devtools/client/application/initializer.js
@@ -55,7 +55,7 @@ const {
  * called to start the UI for the panel.
  */
 window.Application = {
-  async bootstrap({ toolbox, commands, panel }) {
+  async bootstrap({ toolbox, commands }) {
     // bind event handlers to `this`
     this.updateDomain = this.updateDomain.bind(this);
 
diff --git a/devtools/client/application/src/actions/manifest.js b/devtools/client/application/src/actions/manifest.js
index 050fab2b89..ccb62ff13c 100644
--- a/devtools/client/application/src/actions/manifest.js
+++ b/devtools/client/application/src/actions/manifest.js
@@ -20,7 +20,7 @@ const {
 } = require("resource://devtools/client/application/src/constants.js");
 
 function fetchManifest() {
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: FETCH_MANIFEST_START });
     try {
       const manifest = await services.fetchManifest();
diff --git a/devtools/client/application/src/components/manifest/ManifestIssue.js b/devtools/client/application/src/components/manifest/ManifestIssue.js
index 6a9680d604..0ec25734b0 100644
--- a/devtools/client/application/src/components/manifest/ManifestIssue.js
+++ b/devtools/client/application/src/components/manifest/ManifestIssue.js
@@ -38,7 +38,7 @@ class ManifestIssue extends PureComponent {
     switch (level) {
       case MANIFEST_ISSUE_LEVELS.WARNING:
         return {
-          src: "chrome://devtools/skin/images/alert-small.svg",
+          src: "resource://devtools-shared-images/alert-small.svg",
           localizationId: "icon-warning",
         };
       case MANIFEST_ISSUE_LEVELS.ERROR:
diff --git a/devtools/client/application/src/components/service-workers/Worker.js b/devtools/client/application/src/components/service-workers/Worker.js
index bc95e084a9..51cb45c1a6 100644
--- a/devtools/client/application/src/components/service-workers/Worker.js
+++ b/devtools/client/application/src/components/service-workers/Worker.js
@@ -118,7 +118,7 @@ class Worker extends PureComponent {
     return this.props.worker.stateText;
   }
 
-  getClassNameForStatus(baseClass) {
+  getClassNameForStatus() {
     const { state } = this.props.worker;
 
     switch (state) {
diff --git a/devtools/client/application/src/middleware/event-telemetry.js b/devtools/client/application/src/middleware/event-telemetry.js
index 60129d2bde..aa4aa7b62b 100644
--- a/devtools/client/application/src/middleware/event-telemetry.js
+++ b/devtools/client/application/src/middleware/event-telemetry.js
@@ -15,7 +15,7 @@ function eventTelemetryMiddleware(telemetry) {
     telemetry.recordEvent(method, "application", null, details);
   }
 
-  return store => next => action => {
+  return () => next => action => {
     switch (action.type) {
       // ui telemetry
       case UPDATE_SELECTED_PAGE:
diff --git a/devtools/client/application/src/reducers/manifest-state.js b/devtools/client/application/src/reducers/manifest-state.js
index 61a2fa6759..1f7fbf0bb6 100644
--- a/devtools/client/application/src/reducers/manifest-state.js
+++ b/devtools/client/application/src/reducers/manifest-state.js
@@ -67,7 +67,7 @@ function _processRawManifestMembers(rawManifest) {
 
   // filter out extra metadata members (those with moz_ prefix) and icons
   const rawMembers = Object.entries(rawManifest).filter(
-    ([key, value]) => !key.startsWith("moz_") && !(key === "icons")
+    ([key]) => !key.startsWith("moz_") && !(key === "icons")
   );
 
   for (const [key, value] of rawMembers) {
diff --git a/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js b/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
index fe95dabd5e..49f43d47c8 100644
--- a/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
+++ b/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
@@ -34,7 +34,11 @@ add_task(async function () {
 
   const events = getTelemetryEvents("jsdebugger");
   const openToolboxEvent = events.find(event => event.method == "enter");
-  ok(openToolboxEvent.session_id > 0, "Event has a valid session id");
+  Assert.greater(
+    Number(openToolboxEvent.session_id),
+    0,
+    "Event has a valid session id"
+  );
   is(
     openToolboxEvent.start_state,
     "application",
diff --git a/devtools/client/application/test/browser/head.js b/devtools/client/application/test/browser/head.js
index 6b7e67ff8d..265fd44bf0 100644
--- a/devtools/client/application/test/browser/head.js
+++ b/devtools/client/application/test/browser/head.js
@@ -82,7 +82,11 @@ function checkTelemetryEvent(expectedEvent, objectName = "application") {
   // assert we only got 1 event with a valid session ID
   is(events.length, 1, "There was only 1 event logged");
   const [event] = events;
-  ok(event.session_id > 0, "There is a valid session_id in the event");
+  Assert.greater(
+    Number(event.session_id),
+    0,
+    "There is a valid session_id in the event"
+  );
 
   // assert expected data
   Assert.deepEqual(event, { ...expectedEvent, session_id: event.session_id });
diff --git a/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap b/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
index 99e83af1f2..25db8bee3c 100644
--- a/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
+++ b/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
@@ -15,7 +15,7 @@ exports[`ManifestIssue renders the expected snapshot for a warning 1`] = `
   >
     <img
       className="manifest-issue__icon manifest-issue__icon--warning"
-      src="chrome://devtools/skin/images/alert-small.svg"
+      src="resource://devtools-shared-images/alert-small.svg"
     />
   </Localized>
   <span>