From fa37e56d5dc752d73f7d2d2dbb2394cd512048e5 Mon Sep 17 00:00:00 2001 From: Tooru Fujisawa Date: Fri, 30 Jun 2023 16:06:35 +0900 Subject: [PATCH] Use Services global variable if possible Services.jsm is planned to be removed in Firefox 117 cycle in https://bugzilla.mozilla.org/show_bug.cgi?id=1780695 . Services global variable is available in WebExtensions experiments API global from version 88 https://bugzilla.mozilla.org/show_bug.cgi?id=1698158 , and experiments code doesn't have to import Services.jsm for recent versions. --- experiments/displayReceivedHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/displayReceivedHeader.js b/experiments/displayReceivedHeader.js index 874842c..c3271bb 100644 --- a/experiments/displayReceivedHeader.js +++ b/experiments/displayReceivedHeader.js @@ -1,10 +1,10 @@ -/* global ChromeUtils */ +/* global ChromeUtils, globalThis */ /* exported displayReceivedHeader */ "use strict"; const {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services; const [majorVersion] = Services.appinfo.platformVersion.split(".", 1); // eslint-disable-next-line no-var