From 61f7c4fe83ebb49f7c64dd3a768d9f045741cffd Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Wed, 2 Jul 2025 09:43:19 -0400
Subject: [PATCH] Fix remaining bare importESModule() calls

---
 chrome/content/zotero/locateMenu.js          | 2 +-
 chrome/content/zotero/xpcom/reader.js        | 2 +-
 chrome/content/zotero/xpcom/server/server.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/locateMenu.js b/chrome/content/zotero/locateMenu.js
index 0a488ddd23..61ddaf49f4 100644
--- a/chrome/content/zotero/locateMenu.js
+++ b/chrome/content/zotero/locateMenu.js
@@ -23,7 +23,7 @@
     ***** END LICENSE BLOCK *****
 */
 
-ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
+var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 /*
  * This object contains the various functions for the interface
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index 5f55f99f5d..7b68c802b0 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -33,7 +33,7 @@ const ZipReader = Components.Constructor(
 	"open"
 );
 
-ChromeUtils.importESModule("resource://gre/modules/InlineSpellChecker.sys.mjs");
+var { InlineSpellChecker } = ChromeUtils.importESModule("resource://gre/modules/InlineSpellChecker.sys.mjs");
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Invalid_array_length
 const ARRAYBUFFER_MAX_LENGTH = Services.appinfo.is64Bit
diff --git a/chrome/content/zotero/xpcom/server/server.js b/chrome/content/zotero/xpcom/server/server.js
index b08422e840..de8e016b06 100755
--- a/chrome/content/zotero/xpcom/server/server.js
+++ b/chrome/content/zotero/xpcom/server/server.js
@@ -24,7 +24,7 @@
 */
 
 var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");
-ChromeUtils.importESModule("resource://gre/modules/NetUtil.sys.mjs");
+var { NetUtil } = ChromeUtils.importESModule("resource://gre/modules/NetUtil.sys.mjs");
 
 Zotero.Server = new function () {
 	var _onlineObserverRegistered, serv;