Bug 1881752 - Update imports to follow ESM conversions for bustage fix. r=babolivier

Differential Revision: https://phabricator.services.mozilla.com/D202578

--HG--
extra : histedit_source : cf86a38881db2e15fa5665e86a444ac9091357a0

calendar/base/content/calendar-dnd-listener.js

@@ -24,11 +24,11 @@ var calendarTaskButtonDNDObserver;
   var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
   var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-  XPCOMUtils.defineLazyModuleGetters(this, {
-    CalAttachment: "resource:///modules/CalAttachment.jsm",
-    CalAttendee: "resource:///modules/CalAttendee.jsm",
-    CalEvent: "resource:///modules/CalEvent.jsm",
-    CalTodo: "resource:///modules/CalTodo.jsm",
+  ChromeUtils.defineESModuleGetters(this, {
+    CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+    CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+    CalEvent: "resource:///modules/CalEvent.sys.mjs",
+    CalTodo: "resource:///modules/CalTodo.sys.mjs",
   });
 
   var itemConversion = {

calendar/base/content/calendar-extract.js

@@ -10,9 +10,9 @@ var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(this, "extractService", () => {

calendar/base/content/calendar-views-utils.js

@@ -18,8 +18,8 @@ var { countOccurrences } = ChromeUtils.import(
 );
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 /**

calendar/base/content/dialogs/calendar-creation.js

@@ -8,7 +8,9 @@ var { ExtensionParent } = ChromeUtils.importESModule(
 );
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-ChromeUtils.defineModuleGetter(this, "MsgAuthPrompt", "resource:///modules/MsgAsyncPrompter.jsm");
+ChromeUtils.defineESModuleGetters(this, {
+  MsgAuthPrompt: "resource:///modules/MsgAsyncPrompter.sys.mjs",
+});
 
 /* exported checkRequired, fillLocationPlaceholder, selectProvider, updateNoCredentials, */
 

calendar/base/content/dialogs/calendar-dialog-utils.js

@@ -15,8 +15,8 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
 });
 
 // Variables related to whether we are in a tab or a window dialog.

calendar/base/content/dialogs/calendar-event-dialog-attendees.js

@@ -10,8 +10,8 @@ var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm"
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
 });
 
 var readOnly = false;

calendar/base/content/dialogs/calendar-event-dialog-recurrence.js

@@ -8,8 +8,8 @@ var { splitRecurrenceRules } = ChromeUtils.import(
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 var gIsReadOnly = false;

calendar/base/content/dialogs/calendar-event-dialog-reminder.js

@@ -10,8 +10,8 @@ var { PluralForm } = ChromeUtils.importESModule("resource:///modules/PluralForm.
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
 });
 
 var allowedActionsMap = {};

calendar/base/content/item-editing/calendar-item-editing.js

@@ -11,12 +11,15 @@ var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 var { CalTransactionManager } = ChromeUtils.import("resource:///modules/CalTransactionManager.jsm");
 
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalAddTransaction: "resource:///modules/CalTransactionManager.jsm",
   CalDeleteTransaction: "resource:///modules/CalTransactionManager.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
   CalModifyTransaction: "resource:///modules/CalTransactionManager.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
 });
 
 /* exported modifyEventWithDialog, undo, redo, setContextPartstat */

calendar/base/content/item-editing/calendar-item-iframe.js

@@ -33,10 +33,10 @@ var {
 var { PluralForm } = ChromeUtils.importESModule("resource:///modules/PluralForm.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 window.addEventListener("load", onLoad);

calendar/base/content/item-editing/calendar-task-editing.js

@@ -10,8 +10,8 @@ var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 /**

calendar/base/content/widgets/calendar-minimonth.js

@@ -11,7 +11,9 @@
   const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
   const lazy = {};
-  ChromeUtils.defineModuleGetter(lazy, "CalDateTime", "resource:///modules/CalDateTime.jsm");
+  ChromeUtils.defineESModuleGetters(lazy, {
+    CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+  });
 
   const dayFormatter = new Services.intl.DateTimeFormat(undefined, { day: "numeric" });
   const dateFormatter = new Services.intl.DateTimeFormat(undefined, { dateStyle: "long" });

calendar/base/modules/calRecurrenceUtils.jsm

@@ -7,13 +7,12 @@
  */
 
 var { PluralForm } = ChromeUtils.importESModule("resource:///modules/PluralForm.sys.mjs");
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
 const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalRecurrenceDate: "resource:///modules/CalRecurrenceDate.jsm",
-  CalRecurrenceRule: "resource:///modules/CalRecurrenceRule.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalRecurrenceDate: "resource:///modules/CalRecurrenceDate.sys.mjs",
+  CalRecurrenceRule: "resource:///modules/CalRecurrenceRule.sys.mjs",
 });
 
 const EXPORTED_SYMBOLS = [

calendar/base/modules/calUtils.sys.mjs

@@ -8,11 +8,11 @@ const { ICAL } = ChromeUtils.import("resource:///modules/calendar/Ical.jsm");
 ICAL.design.strict = false;
 
 const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalDateTime: "resource:///modules/CalDateTime.jsm",
-  CalDuration: "resource:///modules/CalDuration.jsm",
-  CalRecurrenceDate: "resource:///modules/CalRecurrenceDate.jsm",
-  CalRecurrenceRule: "resource:///modules/CalRecurrenceRule.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+  CalDuration: "resource:///modules/CalDuration.sys.mjs",
+  CalRecurrenceDate: "resource:///modules/CalRecurrenceDate.sys.mjs",
+  CalRecurrenceRule: "resource:///modules/CalRecurrenceRule.sys.mjs",
 });
 
 // The calendar console instance

calendar/base/modules/utils/calAlarmUtils.sys.mjs

@@ -9,16 +9,12 @@
 // NOTE: This module should not be loaded directly, it is available when
 // including calUtils.jsm under the cal.alarm namespace.
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
   cal: "resource:///modules/calendar/calUtils.sys.mjs",
 });
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-});
 
 export var alarms = {
   /**

calendar/base/modules/utils/calAuthUtils.sys.mjs

@@ -7,21 +7,16 @@
  */
 
 // NOTE: This module should not be loaded directly, it is available when including
-// calUtils.jsm under the cal.auth namespace.
-
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+// calUtils.sys.mjs under the cal.auth namespace.
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  MsgAuthPrompt: "resource:///modules/MsgAsyncPrompter.sys.mjs",
   cal: "resource:///modules/calendar/calUtils.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  MsgAuthPrompt: "resource:///modules/MsgAsyncPrompter.jsm",
-});
-
 /**
  * The userContextId of nsIHttpChannel is currently implemented as a uint32, so
  * the ContainerMap defined below must not return Ids greater then the allowed

calendar/base/modules/utils/calInvitationUtils.sys.mjs

@@ -10,11 +10,9 @@ var { recurrenceRule2String } = ChromeUtils.import(
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "CalRecurrenceDate",
-  "resource:///modules/CalRecurrenceDate.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalRecurrenceDate: "resource:///modules/CalRecurrenceDate.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(lazy, "MailStringUtils", "resource:///modules/MailStringUtils.jsm");
 
 export var invitation = {

calendar/base/modules/utils/calItipUtils.sys.mjs

@@ -17,14 +17,14 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
-  CalItipDefaultEmailTransport: "resource:///modules/CalItipEmailTransport.jsm",
   CalItipMessageSender: "resource:///modules/CalItipMessageSender.jsm",
   CalItipOutgoingMessage: "resource:///modules/CalItipOutgoingMessage.jsm",
 });
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalItipDefaultEmailTransport: "resource:///modules/CalItipEmailTransport.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
   cal: "resource:///modules/calendar/calUtils.sys.mjs",
 });
 

calendar/base/modules/utils/calProviderUtils.sys.mjs

@@ -15,11 +15,11 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  CalPeriod: "resource:///modules/CalPeriod.sys.mjs",
   cal: "resource:///modules/calendar/calUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalPeriod: "resource:///modules/CalPeriod.jsm",
   CalReadableStreamFactory: "resource:///modules/CalReadableStreamFactory.jsm",
 });
 
@@ -894,8 +894,8 @@ ChromeUtils.defineLazyGetter(provider, "providers", () => {
 
 // This is the transport returned by getImipTransport().
 ChromeUtils.defineLazyGetter(provider, "defaultImipTransport", () => {
-  const { CalItipEmailTransport } = ChromeUtils.import(
-    "resource:///modules/CalItipEmailTransport.jsm"
+  const { CalItipEmailTransport } = ChromeUtils.importESModule(
+    "resource:///modules/CalItipEmailTransport.sys.mjs"
   );
   return CalItipEmailTransport.createInstance();
 });

calendar/base/src/CalAlarm.sys.mjs

@@ -4,15 +4,14 @@
 
 import { PluralForm } from "resource:///modules/PluralForm.sys.mjs";
 import { cal } from "resource:///modules/calendar/calUtils.sys.mjs";
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalDateTime: "resource:///modules/CalDateTime.jsm",
-  CalDuration: "resource:///modules/CalDuration.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+  CalDuration: "resource:///modules/CalDuration.sys.mjs",
 });
 
 const ALARM_RELATED_ABSOLUTE = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;

calendar/base/src/CalAlarmMonitor.sys.mjs

@@ -5,7 +5,9 @@
 import { cal } from "resource:///modules/calendar/calUtils.sys.mjs";
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(lazy, "CalEvent", "resource:///modules/CalEvent.jsm");
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+});
 
 function peekAlarmWindow() {
   return Services.wm.getMostRecentWindow("Calendar:AlarmWindow");

calendar/base/src/CalAlarmService.sys.mjs

@@ -6,7 +6,9 @@ import { cal } from "resource:///modules/calendar/calUtils.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(lazy, "CalDateTime", "resource:///modules/CalDateTime.jsm");
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+});
 
 var kHoursBetweenUpdates = 6;
 

calendar/base/src/CalDateTime.sys.mjs

@@ -5,7 +5,9 @@
 const { ICAL, unwrap, unwrapSetter } = ChromeUtils.import("resource:///modules/calendar/Ical.jsm");
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(lazy, "CalDuration", "resource:///modules/CalDuration.jsm");
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalDuration: "resource:///modules/CalDuration.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(lazy, "CalTimezone", "resource:///modules/CalTimezone.jsm");
 
 var UNIX_TIME_TO_PRTIME = 1000000;

calendar/base/src/CalIcsParser.sys.mjs

@@ -4,17 +4,13 @@
 
 import { cal } from "resource:///modules/calendar/calUtils.sys.mjs";
 import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs";
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CalEvent: "resource:///modules/CalEvent.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalTodo: "resource:///modules/CalTodo.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 export function CalIcsParser() {

calendar/base/src/calItemBase.js

@@ -5,15 +5,15 @@
 /* exported makeMemberAttr, makeMemberAttrProperty */
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalAttendee } = ChromeUtils.import("resource:///modules/CalAttendee.jsm");
-var { CalRelation } = ChromeUtils.import("resource:///modules/CalRelation.jsm");
-var { CalAttachment } = ChromeUtils.import("resource:///modules/CalAttachment.jsm");
+var { CalAttendee } = ChromeUtils.importESModule("resource:///modules/CalAttendee.sys.mjs");
+var { CalRelation } = ChromeUtils.importESModule("resource:///modules/CalRelation.sys.mjs");
+var { CalAttachment } = ChromeUtils.importESModule("resource:///modules/CalAttachment.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalDateTime: "resource:///modules/CalDateTime.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

calendar/providers/storage/CalStorageItemModel.jsm

@@ -15,18 +15,16 @@ const { CalStorageModelBase } = ChromeUtils.import(
   "resource:///modules/calendar/CalStorageModelBase.jsm"
 );
 
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
-
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 const cICL = Ci.calIChangeLog;
@@ -44,7 +42,7 @@ let startupPromise;
 if (Services.appinfo.name == "xpcshell") {
   startupPromise = Promise.resolve();
 } else {
-  const { MailGlue } = ChromeUtils.import("resource:///modules/MailGlue.jsm");
+  const { MailGlue } = ChromeUtils.importESModule("resource:///modules/MailGlue.sys.mjs");
   startupPromise = MailGlue.afterStartUp;
 }
 

calendar/providers/storage/calStorageUpgrade.jsm

@@ -79,15 +79,14 @@ var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.
 var { CAL_ITEM_FLAG, textToDate, getTimezone, newDateTime } = ChromeUtils.import(
   "resource:///modules/calendar/calStorageHelpers.jsm"
 );
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
 });
 
 // The current database version. Be sure to increment this when you create a new

calendar/test/ItemEditingHelpers.jsm

@@ -21,7 +21,7 @@ var { sendString, synthesizeKey, synthesizeMouseAtCenter } = ChromeUtils.import(
 );
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalDateTime } = ChromeUtils.import("resource:///modules/CalDateTime.jsm");
+var { CalDateTime } = ChromeUtils.importESModule("resource:///modules/CalDateTime.sys.mjs");
 var { setTimeout } = ChromeUtils.importESModule("resource://gre/modules/Timer.sys.mjs");
 
 function sleep(window, time = 0) {

calendar/test/browser/browser_calDAV_oAuth.js

@@ -5,7 +5,7 @@
 // Creates calendars in various configurations (current and legacy) and performs
 // requests in each of them to prove that OAuth2 authentication is working as expected.
 
-var { CalDavCalendar } = ChromeUtils.import("resource:///modules/CalDavCalendar.jsm");
+var { CalDavCalendar } = ChromeUtils.importESModule("resource:///modules/CalDavCalendar.sys.mjs");
 var { CalDavGenericRequest } = ChromeUtils.import("resource:///modules/caldav/CalDavRequest.jsm");
 
 var LoginInfo = Components.Constructor(

calendar/test/browser/browser_calendarTelemetry.js

@@ -7,7 +7,9 @@
  * Test telemetry related to calendar.
  */
 
-const { MailTelemetryForTests } = ChromeUtils.import("resource:///modules/MailGlue.jsm");
+const { MailTelemetryForTests } = ChromeUtils.importESModule(
+  "resource:///modules/MailGlue.sys.mjs"
+);
 const { TelemetryTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );

calendar/test/browser/browser_calendarUnifinder.js

@@ -8,9 +8,9 @@ const { mailTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 /**

calendar/test/browser/browser_dragEventItem.js

@@ -7,8 +7,8 @@
  */
 const { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 const calendar = CalendarTestUtils.createCalendar("Drag Test", "memory");

calendar/test/browser/browser_eventDisplay_dayView.js

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 var calendar = CalendarTestUtils.createCalendar();

calendar/test/browser/browser_eventDisplay_multiWeekView.js

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 var calendar = CalendarTestUtils.createCalendar();

calendar/test/browser/browser_eventDisplay_weekView.js

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 var calendar = CalendarTestUtils.createCalendar();

calendar/test/browser/browser_eventUndoRedo.js

@@ -9,8 +9,11 @@
  * manipulating events.
  */
 
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
   CalTransactionManager: "resource:///modules/CalTransactionManager.jsm",
 });
 

calendar/test/browser/browser_taskDelete.js

@@ -10,9 +10,9 @@ const { mailTestUtils } = ChromeUtils.import(
 );
 const { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 const calendar = CalendarTestUtils.createCalendar("Task Delete Test", "memory");

calendar/test/browser/browser_taskDisplay.js

@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 var calendar = CalendarTestUtils.createCalendar();

calendar/test/browser/browser_taskUndoRedo.js

@@ -11,8 +11,11 @@
 
 var { mailTestUtils } = ChromeUtils.import("resource://testing-common/mailnews/MailTestUtils.jsm");
 
+ChromeUtils.defineESModuleGetters(this, {
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
-  CalTodo: "resource:///modules/CalTodo.jsm",
   CalTransactionManager: "resource:///modules/CalTransactionManager.jsm",
 });
 

calendar/test/browser/browser_todayPane.js

@@ -9,10 +9,10 @@ var { formatDate, formatTime } = ChromeUtils.import(
   "resource://testing-common/calendar/ItemEditingHelpers.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalDateTime: "resource:///modules/CalDateTime.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalDateTime: "resource:///modules/CalDateTime.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 const calendar = CalendarTestUtils.createCalendar();

calendar/test/browser/contextMenu/browser_edit.js

@@ -7,8 +7,8 @@ const { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 /**

calendar/test/browser/eventDialog/browser_attendeesDialogAdd.js

@@ -4,7 +4,7 @@
 
 /* globals openAttendeesWindow, closeAttendeesWindow, findAndEditMatchingRow */
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 
 add_setup(async function () {
   await CalendarTestUtils.setCalendarView(window, "day");

calendar/test/browser/eventDialog/browser_attendeesDialogNoEdit.js

@@ -4,7 +4,7 @@
 
 /* globals openAttendeesWindow, closeAttendeesWindow, findAndFocusMatchingRow */
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 
 add_setup(async function () {
   await CalendarTestUtils.setCalendarView(window, "day");

calendar/test/browser/eventDialog/browser_attendeesDialogRemove.js

@@ -4,7 +4,7 @@
 
 /* globals openAttendeesWindow, closeAttendeesWindow, findAndEditMatchingRow */
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 
 add_setup(async function () {
   await CalendarTestUtils.setCalendarView(window, "day");

calendar/test/browser/eventDialog/browser_attendeesDialogUpdate.js

@@ -4,7 +4,7 @@
 
 /* globals openAttendeesWindow, closeAttendeesWindow, findAndEditMatchingRow */
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 
 add_setup(async function () {
   await CalendarTestUtils.setCalendarView(window, "day");

calendar/test/browser/eventDialog/browser_eventDialog.js

@@ -9,8 +9,8 @@ var { cancelItemDialog, formatTime, saveAndCloseItemDialog, setData } = ChromeUt
 );
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 const EVENTTITLE = "Event";

calendar/test/browser/eventDialog/browser_eventDialogDescriptionEditor.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 const { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
 add_setup(async function () {

calendar/test/browser/eventDialog/browser_eventDialogEditButton.js

@@ -8,9 +8,9 @@
 
 const { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 const calendar = CalendarTestUtils.createCalendar("Edit Button Test", "storage");

calendar/test/browser/invitations/browser_imipBar.js

@@ -8,8 +8,8 @@
 "use strict";
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalItipDefaultEmailTransport } = ChromeUtils.import(
-  "resource:///modules/CalItipEmailTransport.jsm"
+var { CalItipDefaultEmailTransport } = ChromeUtils.importESModule(
+  "resource:///modules/CalItipEmailTransport.sys.mjs"
 );
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 

calendar/test/browser/invitations/browser_imipBarExceptionCancel.js

@@ -15,8 +15,8 @@ var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 let identity;

calendar/test/browser/invitations/browser_imipBarExceptions.js

@@ -15,8 +15,8 @@ var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 let identity;

calendar/test/browser/invitations/browser_invitationDisplayNew.js

@@ -8,8 +8,8 @@
 "use strict";
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalItipDefaultEmailTransport } = ChromeUtils.import(
-  "resource:///modules/CalItipEmailTransport.jsm"
+var { CalItipDefaultEmailTransport } = ChromeUtils.importESModule(
+  "resource:///modules/CalItipEmailTransport.sys.mjs"
 );
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 

calendar/test/browser/invitations/head.js

@@ -12,8 +12,8 @@
 "use strict";
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalItipDefaultEmailTransport } = ChromeUtils.import(
-  "resource:///modules/CalItipEmailTransport.jsm"
+var { CalItipDefaultEmailTransport } = ChromeUtils.importESModule(
+  "resource:///modules/CalItipEmailTransport.sys.mjs"
 );
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 

calendar/test/browser/views/browser_propertyChanges.js

@@ -5,7 +5,7 @@
 /** Tests that changes in a calendar's properties are reflected in the current view. */
 
 const { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 
 const composite = cal.view.getCompositeCalendar(window);
 

calendar/test/unit/providers/head.js

@@ -6,7 +6,7 @@ var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.
 var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
-var { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+var { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 var { updateAppInfo } = ChromeUtils.importESModule("resource://testing-common/AppInfo.sys.mjs");
 updateAppInfo();
 

calendar/test/unit/test_alarm.js

@@ -4,11 +4,11 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_tests() {

calendar/test/unit/test_alarmservice.js

@@ -5,10 +5,10 @@
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 var { TestUtils } = ChromeUtils.importESModule("resource://testing-common/TestUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 var EXPECT_NONE = 0;

calendar/test/unit/test_alarmutils.js

@@ -5,10 +5,10 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_attachment.js

@@ -5,9 +5,9 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_attendee.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug1199942.js

@@ -5,9 +5,9 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug1204255.js

@@ -5,9 +5,9 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug1209399.js

@@ -5,9 +5,9 @@
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug485571.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug486186.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug653924.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_bug668222.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_caldav_requests.js

@@ -28,8 +28,8 @@ var { CalDavXmlns } = ChromeUtils.import("resource:///modules/caldav/CalDavUtils
 var { Preferences } = ChromeUtils.importESModule("resource://gre/modules/Preferences.sys.mjs");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 class LowerMap extends Map {

calendar/test/unit/test_calmgr.js

@@ -8,8 +8,8 @@ var { CalReadableStreamFactory } = ChromeUtils.import(
 );
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 /**

calendar/test/unit/test_calreadablestreamfactory.js

@@ -7,7 +7,7 @@
  */
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-var { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+var { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 var { CalReadableStreamFactory } = ChromeUtils.import(
   "resource:///modules/CalReadableStreamFactory.jsm"
 );

calendar/test/unit/test_datetime.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_deleted_items.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 add_setup(function () {

calendar/test/unit/test_email_utils.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_filter.js

@@ -8,8 +8,8 @@ const { CalendarTestUtils } = ChromeUtils.import(
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
-const { CalTodo } = ChromeUtils.import("resource:///modules/CalTodo.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
+const { CalTodo } = ChromeUtils.importESModule("resource:///modules/CalTodo.sys.mjs");
 
 /* globals calFilter, CalReadableStreamFactory */
 Services.scriptloader.loadSubScript("chrome://calendar/content/widgets/calendar-filter.js");

calendar/test/unit/test_filter_mixin.js

@@ -7,9 +7,11 @@ const { CalendarTestUtils } = ChromeUtils.import(
 );
 const { TestUtils } = ChromeUtils.importESModule("resource://testing-common/TestUtils.sys.mjs");
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
-const { CalRecurrenceInfo } = ChromeUtils.import("resource:///modules/CalRecurrenceInfo.jsm");
-const { CalTodo } = ChromeUtils.import("resource:///modules/CalTodo.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
+const { CalRecurrenceInfo } = ChromeUtils.importESModule(
+  "resource:///modules/CalRecurrenceInfo.sys.mjs"
+);
+const { CalTodo } = ChromeUtils.importESModule("resource:///modules/CalTodo.sys.mjs");
 
 /* globals CalendarFilteredViewMixin, CalReadableStreamFactory */
 Services.scriptloader.loadSubScript("chrome://calendar/content/widgets/calendar-filter.js");

calendar/test/unit/test_filter_tree_view.js

@@ -7,9 +7,13 @@ const { CalendarTestUtils } = ChromeUtils.import(
 );
 const { TestUtils } = ChromeUtils.importESModule("resource://testing-common/TestUtils.sys.mjs");
 
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
-const { CalRecurrenceInfo } = ChromeUtils.import("resource:///modules/CalRecurrenceInfo.jsm");
-const { CalRecurrenceRule } = ChromeUtils.import("resource:///modules/CalRecurrenceRule.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
+const { CalRecurrenceInfo } = ChromeUtils.importESModule(
+  "resource:///modules/CalRecurrenceInfo.sys.mjs"
+);
+const { CalRecurrenceRule } = ChromeUtils.importESModule(
+  "resource:///modules/CalRecurrenceRule.sys.mjs"
+);
 
 const { TreeSelection } = ChromeUtils.importESModule(
   "chrome://messenger/content/tree-selection.mjs"

calendar/test/unit/test_hashedarray.js

@@ -5,8 +5,8 @@
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calHashedArray.jsm");
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_ics.js

@@ -4,12 +4,12 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_ics_service.js

@@ -4,10 +4,10 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_imip.js

@@ -2,7 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var { CalItipEmailTransport } = ChromeUtils.import("resource:///modules/CalItipEmailTransport.jsm");
+var { CalItipEmailTransport } = ChromeUtils.importESModule(
+  "resource:///modules/CalItipEmailTransport.sys.mjs"
+);
 
 function itipItemForTest(title, seq) {
   const itipItem = Cc["@mozilla.org/calendar/itip-item;1"].createInstance(Ci.calIItipItem);

calendar/test/unit/test_invitationutils.js

@@ -7,8 +7,8 @@ var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm"
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 var { MailStringUtils } = ChromeUtils.import("resource:///modules/MailStringUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_items.js

@@ -8,12 +8,12 @@ var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAlarm: "resource:///modules/CalAlarm.jsm",
-  CalAttachment: "resource:///modules/CalAttachment.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAlarm: "resource:///modules/CalAlarm.sys.mjs",
+  CalAttachment: "resource:///modules/CalAttachment.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_itip_message_sender.js

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var { cal } = ChromeUtils.importESModule("resource:///modules/calendar/calUtils.sys.mjs");
-const { CalAttendee } = ChromeUtils.import("resource:///modules/CalAttendee.jsm");
-var { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
+const { CalAttendee } = ChromeUtils.importESModule("resource:///modules/CalAttendee.sys.mjs");
+var { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
 var { CalItipMessageSender } = ChromeUtils.import("resource:///modules/CalItipMessageSender.jsm");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 

calendar/test/unit/test_itip_utils.js

@@ -10,10 +10,10 @@ var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalItipEmailTransport: "resource:///modules/CalItipEmailTransport.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalItipEmailTransport: "resource:///modules/CalItipEmailTransport.sys.mjs",
 });
 
 // tests for calItipUtils.jsm

calendar/test/unit/test_recur.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.sys.mjs",
 });
 
 function makeEvent(str) {

calendar/test/unit/test_relation.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalRelation: "resource:///modules/CalRelation.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalRelation: "resource:///modules/CalRelation.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_storage_get_items.js

@@ -9,8 +9,8 @@
 const { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
-const { CalTodo } = ChromeUtils.import("resource:///modules/CalTodo.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
+const { CalTodo } = ChromeUtils.importESModule("resource:///modules/CalTodo.sys.mjs");
 
 do_get_profile();
 

calendar/test/unit/test_timezone.js

@@ -4,8 +4,8 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_transaction_manager.js

@@ -9,8 +9,8 @@
 const { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
-const { CalEvent } = ChromeUtils.import("resource:///modules/CalEvent.jsm");
-const { CalTodo } = ChromeUtils.import("resource:///modules/CalTodo.jsm");
+const { CalEvent } = ChromeUtils.importESModule("resource:///modules/CalEvent.sys.mjs");
+const { CalTodo } = ChromeUtils.importESModule("resource:///modules/CalTodo.sys.mjs");
 const {
   CalTransactionManager,
   CalTransaction,

calendar/test/unit/test_unifinder_utils.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_utils.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

calendar/test/unit/test_view_utils.js

@@ -4,9 +4,9 @@
 
 var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  CalEvent: "resource:///modules/CalEvent.jsm",
-  CalTodo: "resource:///modules/CalTodo.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  CalEvent: "resource:///modules/CalEvent.sys.mjs",
+  CalTodo: "resource:///modules/CalTodo.sys.mjs",
 });
 
 function run_test() {

mail/base/test/browser/browser_preferDisplayName.js

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddrBookCard } = ChromeUtils.import(
-  "resource:///modules/AddrBookCard.jsm"
+const { AddrBookCard } = ChromeUtils.importESModule(
+  "resource:///modules/AddrBookCard.sys.mjs"
 );
 const { MessageGenerator } = ChromeUtils.import(
   "resource://testing-common/mailnews/MessageGenerator.jsm"

mail/base/test/unit/test_devtools_url.js

@@ -4,7 +4,9 @@
  * MailGlue that observes command-line-startup will not be working properly.
  */
 
-var { MailGlue } = ChromeUtils.import("resource:///modules/MailGlue.jsm");
+var { MailGlue } = ChromeUtils.importESModule(
+  "resource:///modules/MailGlue.sys.mjs"
+);
 
 add_task(async () => {
   const expectedURL = `"${MailGlue.BROWSER_TOOLBOX_WINDOW_URL}"`;

mail/components/addrbook/content/aboutAddressBook.js

@@ -22,24 +22,24 @@ ChromeUtils.defineLazyGetter(this, "ABQueryUtils", function () {
 });
 
 ChromeUtils.defineESModuleGetters(this, {
+  AddrBookCard: "resource:///modules/AddrBookCard.sys.mjs",
+  CalAttendee: "resource:///modules/CalAttendee.sys.mjs",
+  CardDAVDirectory: "resource:///modules/CardDAVDirectory.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   PluralForm: "resource:///modules/PluralForm.sys.mjs",
-  cal: "resource:///modules/calendar/calUtils.sys.mjs",
   UIDensity: "resource:///modules/UIDensity.sys.mjs",
   UIFontSize: "resource:///modules/UIFontSize.sys.mjs",
+  VCardProperties: "resource:///modules/VCardUtils.sys.mjs",
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+  cal: "resource:///modules/calendar/calUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AddrBookCard: "resource:///modules/AddrBookCard.jsm",
   AddrBookUtils: "resource:///modules/AddrBookUtils.jsm",
-  CalAttendee: "resource:///modules/CalAttendee.jsm",
   CalMetronome: "resource:///modules/CalMetronome.jsm",
-  CardDAVDirectory: "resource:///modules/CardDAVDirectory.jsm",
   GlodaMsgSearcher: "resource:///modules/gloda/GlodaMsgSearcher.jsm",
   ICAL: "resource:///modules/calendar/Ical.jsm",
   MailE10SUtils: "resource:///modules/MailE10SUtils.jsm",
-  VCardProperties: "resource:///modules/VCardUtils.jsm",
-  VCardPropertyEntry: "resource:///modules/VCardUtils.jsm",
 });
 ChromeUtils.defineLazyGetter(this, "SubDialog", function () {
   const { SubDialogManager } = ChromeUtils.importESModule(

mail/components/addrbook/content/vcard-edit/adr.mjs

@@ -5,11 +5,9 @@
 import { vCardIdGen } from "./id-gen.mjs";
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardPropertyEntry",
-  "resource:///modules/VCardUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+});
 
 /**
  * @implements {VCardPropertyEntryView}

mail/components/addrbook/content/vcard-edit/edit.mjs

@@ -22,16 +22,10 @@ import { VCardTZComponent } from "./tz.mjs";
 import { VCardURLComponent } from "./url.mjs";
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardProperties",
-  "resource:///modules/VCardUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardPropertyEntry",
-  "resource:///modules/VCardUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  VCardProperties: "resource:///modules/VCardUtils.sys.mjs",
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+});
 
 class VCardEdit extends HTMLElement {
   constructor() {

mail/components/addrbook/content/vcard-edit/email.mjs

@@ -3,11 +3,9 @@
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardPropertyEntry",
-  "resource:///modules/VCardUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+});
 
 /**
  * @implements {VCardPropertyEntryView}

mail/components/addrbook/content/vcard-edit/fn.mjs

@@ -3,11 +3,9 @@
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardPropertyEntry",
-  "resource:///modules/VCardUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+});
 
 /**
  * @implements {VCardPropertyEntryView}

mail/components/addrbook/content/vcard-edit/impp.mjs

@@ -5,11 +5,9 @@
 import { vCardIdGen } from "./id-gen.mjs";
 
 const lazy = {};
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "VCardPropertyEntry",
-  "resource:///modules/VCardUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  VCardPropertyEntry: "resource:///modules/VCardUtils.sys.mjs",
+});
 
 /**
  * @implements {VCardPropertyEntryView}