From 2051f08b4c658e39e8a5df1c5c3dff8390dd28ad Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 6 Nov 2023 01:26:47 -0500
Subject: [PATCH] fx115: Move `Zotero` object initialization to zotero.mjs

---
 app/scripts/fetch_xulrunner                   |   2 +-
 chrome.manifest                               |   2 -
 chrome/content/scaffold/scaffold.js           |   7 +-
 chrome/content/zotero/BlockingObserver.jsm    |   5 +-
 chrome/content/zotero/EPUB.jsm                |   6 +-
 chrome/content/zotero/HiddenBrowser.jsm       |   4 +-
 chrome/content/zotero/RemoteTranslate.jsm     |   4 +-
 .../zotero/actors/TranslationParent.jsm       |   4 +-
 chrome/content/zotero/advancedSearch.xhtml    |   3 +-
 chrome/content/zotero/customElements.js       |   2 +
 .../content/zotero/import/importWizard.xhtml  |   8 +-
 chrome/content/zotero/include.js              |  11 +-
 chrome/content/zotero/include.jsm             |   5 -
 chrome/content/zotero/update/updates.js       |   2 +-
 .../zotero/xpcom/utilities_internal.js        |   2 -
 chrome/content/zotero/xpcom/zotero.js         |   1 +
 chrome/content/zotero/zotero.mjs              | 425 +++++++++++++++++
 chrome/content/zotero/zoteroPane.xhtml        |   2 +-
 components/zotero-service.js                  | 445 ------------------
 19 files changed, 450 insertions(+), 490 deletions(-)
 delete mode 100644 chrome/content/zotero/include.jsm
 create mode 100644 chrome/content/zotero/zotero.mjs

diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner
index f814bf4660..64f5455b8d 100755
--- a/app/scripts/fetch_xulrunner
+++ b/app/scripts/fetch_xulrunner
@@ -253,7 +253,7 @@ function modify_omni {
 	cp "$APP_ROOT_DIR/assets/multilocale.txt" res/multilocale.txt
 	
 	# Use Zotero URL opening in Mozilla dialogs (e.g., app update dialog)
-	replace_line 'function openURL\(aURL\) \{' 'function openURL(aURL) {let {Zotero} = ChromeUtils.import("chrome:\/\/zotero\/content\/include.jsm"); Zotero.launchURL(aURL); if (true) { return; }' chrome/toolkit/content/global/contentAreaUtils.js
+	replace_line 'function openURL\(aURL\) \{' 'function openURL(aURL) {let {Zotero} = ChromeUtils.importESModule("chrome:\/\/zotero\/content\/zotero.mjs"); Zotero.launchURL(aURL); if (true) { return; }' chrome/toolkit/content/global/contentAreaUtils.js
 	
 	#
 	# Modify Add-ons window
diff --git a/chrome.manifest b/chrome.manifest
index 7612eaa42c..987caef622 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -63,9 +63,7 @@ locale	zotero	zh-TW		chrome/locale/zh-TW/zotero/
 
 skin		zotero	default		chrome/skin/default/zotero/
 
-component	{e4c61080-ec2d-11da-8ad9-0800200c9a66}			components/zotero-service.js
 component	{531828f8-a16c-46be-b9aa-14845c3b010f}			components/zotero-service.js
-contract	@zotero.org/Zotero;1 							{e4c61080-ec2d-11da-8ad9-0800200c9a66}
 contract	@mozilla.org/browser/clh;1						{531828f8-a16c-46be-b9aa-14845c3b010f}
 category	command-line-handler m-zotero					@mozilla.org/browser/clh;1
 
diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js
index b1df123669..e1000e92c9 100644
--- a/chrome/content/scaffold/scaffold.js
+++ b/chrome/content/scaffold/scaffold.js
@@ -29,14 +29,9 @@ var { Subprocess } = ChromeUtils.import("resource://gre/modules/Subprocess.jsm")
 var { RemoteTranslate } = ChromeUtils.import("chrome://zotero/content/RemoteTranslate.jsm");
 var { ContentDOMReference } = ChromeUtils.import("resource://gre/modules/ContentDOMReference.jsm");
 
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 import FilePicker from 'zotero/modules/filePicker';
 
-var Zotero = Components.classes["@zotero.org/Zotero;1"]
-				// Currently uses only nsISupports
-				//.getService(Components.interfaces.chnmIZoteroService).
-				.getService(Components.interfaces.nsISupports)
-				.wrappedJSObject;
-
 // Fix JSON stringify 2028/2029 "bug"
 // Borrowed from http://stackoverflow.com/questions/16686687/json-stringify-and-u2028-u2029-check
 if (JSON.stringify(["\u2028\u2029"]) !== '["\\u2028\\u2029"]') {
diff --git a/chrome/content/zotero/BlockingObserver.jsm b/chrome/content/zotero/BlockingObserver.jsm
index 3616a7cb26..99d8b49813 100644
--- a/chrome/content/zotero/BlockingObserver.jsm
+++ b/chrome/content/zotero/BlockingObserver.jsm
@@ -25,9 +25,8 @@
 
 const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-	Services: "resource://gre/modules/Services.jsm",
-	Zotero: "chrome://zotero/content/include.jsm"
+ChromeUtils.defineESModuleGetters(this, {
+	Zotero: "chrome://zotero/content/zotero.mjs",
 });
 
 var EXPORTED_SYMBOLS = ["BlockingObserver"];
diff --git a/chrome/content/zotero/EPUB.jsm b/chrome/content/zotero/EPUB.jsm
index 22f154e23a..71f12f19c1 100644
--- a/chrome/content/zotero/EPUB.jsm
+++ b/chrome/content/zotero/EPUB.jsm
@@ -25,10 +25,8 @@
 
 var EXPORTED_SYMBOLS = ["EPUB"];
 
-const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-	Zotero: "chrome://zotero/content/include.jsm"
+ChromeUtils.defineESModuleGetters(this, {
+	Zotero: "chrome://zotero/content/zotero.mjs",
 });
 
 const ZipReader = Components.Constructor(
diff --git a/chrome/content/zotero/HiddenBrowser.jsm b/chrome/content/zotero/HiddenBrowser.jsm
index 9f0395ba43..1c03ed499a 100644
--- a/chrome/content/zotero/HiddenBrowser.jsm
+++ b/chrome/content/zotero/HiddenBrowser.jsm
@@ -35,7 +35,9 @@ XPCOMUtils.defineLazyModuleGetters(this, {
 	HiddenFrame: "resource://gre/modules/HiddenFrame.jsm",
 	Services: "resource://gre/modules/Services.jsm",
 	setTimeout: "resource://gre/modules/Timer.jsm",
-	Zotero: "chrome://zotero/content/include.jsm"
+});
+ChromeUtils.defineESModuleGetters(this, {
+	Zotero: "chrome://zotero/content/zotero.mjs"
 });
 
 ChromeUtils.registerWindowActor("PageData", {
diff --git a/chrome/content/zotero/RemoteTranslate.jsm b/chrome/content/zotero/RemoteTranslate.jsm
index 9e66e29440..35a42dc606 100644
--- a/chrome/content/zotero/RemoteTranslate.jsm
+++ b/chrome/content/zotero/RemoteTranslate.jsm
@@ -36,8 +36,10 @@ ChromeUtils.registerWindowActor("Translation", {
 	}
 });
 
+ChromeUtils.defineESModuleGetters(this, {
+	Zotero: "chrome://zotero/content/zotero.mjs",
+});
 XPCOMUtils.defineLazyModuleGetters(this, {
-	Zotero: "chrome://zotero/content/include.jsm",
 	TranslationManager: "chrome://zotero/content/actors/TranslationParent.jsm",
 });
 
diff --git a/chrome/content/zotero/actors/TranslationParent.jsm b/chrome/content/zotero/actors/TranslationParent.jsm
index af0f6527e4..38e77c6354 100644
--- a/chrome/content/zotero/actors/TranslationParent.jsm
+++ b/chrome/content/zotero/actors/TranslationParent.jsm
@@ -1,8 +1,6 @@
 var EXPORTED_SYMBOLS = ["TranslationParent", "TranslationManager"];
 
-const Zotero = Components.classes['@zotero.org/Zotero;1']
-	.getService(Components.interfaces.nsISupports)
-	.wrappedJSObject;
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 
 const TranslationManager = new class {
 	_registeredRemoteTranslates = new Map();
diff --git a/chrome/content/zotero/advancedSearch.xhtml b/chrome/content/zotero/advancedSearch.xhtml
index ec61dd7ba4..ab78840cfb 100644
--- a/chrome/content/zotero/advancedSearch.xhtml
+++ b/chrome/content/zotero/advancedSearch.xhtml
@@ -24,11 +24,10 @@
 	windowtype="zotero:search"
 	style="display: flex;">
 
+	<script src="include.js"/>
 	<script>
 		var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 	</script>
-	
-	<script src="include.js"/>
 	<script src="customElements.js"/>
 	<script src="advancedSearch.js"/>
 
diff --git a/chrome/content/zotero/customElements.js b/chrome/content/zotero/customElements.js
index 43659de7d9..f8a8099f2c 100644
--- a/chrome/content/zotero/customElements.js
+++ b/chrome/content/zotero/customElements.js
@@ -25,6 +25,8 @@
 
 'use strict';
 
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
+
 Services.scriptloader.loadSubScript("resource://zotero/require.js", this);
 
 Services.scriptloader.loadSubScript("chrome://global/content/customElements.js", this);
diff --git a/chrome/content/zotero/import/importWizard.xhtml b/chrome/content/zotero/import/importWizard.xhtml
index 3d65a616d2..2a5bf34ebe 100644
--- a/chrome/content/zotero/import/importWizard.xhtml
+++ b/chrome/content/zotero/import/importWizard.xhtml
@@ -17,9 +17,10 @@
 	</linkset>
 
 	<script>
-		var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/fileInterface.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/import/importWizard.js", this);
 	</script>
 	
 	<wizard id="import-wizard" class="import-wizard" width="600" height="400">
@@ -114,7 +115,4 @@
 			</div>
 		</wizardpage>
 	</wizard>
-
-	<script src="../fileInterface.js"/>
-	<script src="./importWizard.js" />
 </window>
\ No newline at end of file
diff --git a/chrome/content/zotero/include.js b/chrome/content/zotero/include.js
index 2ba044c7f9..8fb85a11ae 100644
--- a/chrome/content/zotero/include.js
+++ b/chrome/content/zotero/include.js
@@ -1,9 +1,4 @@
-/* global Components:false */
-/* eslint-disable no-unused-vars */
-
-var Zotero = Components.classes['@zotero.org/Zotero;1']
-	.getService(Components.interfaces.nsISupports)
-	.wrappedJSObject;
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 
 // Components.utils.import('resource://zotero/require.js');
 // Not using Cu.import here since we don't want the require module to be cached
@@ -22,5 +17,5 @@ if (typeof require == "undefined") {
 }
 
 if (winName) {
-	window.name = winName;
-}
\ No newline at end of file
+	 window.name = winName;
+}
diff --git a/chrome/content/zotero/include.jsm b/chrome/content/zotero/include.jsm
deleted file mode 100644
index 65e8659da3..0000000000
--- a/chrome/content/zotero/include.jsm
+++ /dev/null
@@ -1,5 +0,0 @@
-var EXPORTED_SYMBOLS = ["Zotero"];
-
-var Zotero = Components.classes['@zotero.org/Zotero;1']
-	.getService(Components.interfaces.nsISupports)
-	.wrappedJSObject;
diff --git a/chrome/content/zotero/update/updates.js b/chrome/content/zotero/update/updates.js
index c48d55bbd3..fae714910c 100644
--- a/chrome/content/zotero/update/updates.js
+++ b/chrome/content/zotero/update/updates.js
@@ -8,7 +8,7 @@
 /* import-globals-from ../../../content/contentAreaUtils.js */
 
 /* globals DownloadUtils, Services, AUSTLMY */
-const { Zotero } = ChromeUtils.import("chrome://zotero/content/include.jsm");
+const { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 
 const { DownloadUtils } = ChromeUtils.import(
   "resource://gre/modules/DownloadUtils.jsm"
diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js
index 3dee2310a1..375c59425a 100644
--- a/chrome/content/zotero/xpcom/utilities_internal.js
+++ b/chrome/content/zotero/xpcom/utilities_internal.js
@@ -26,8 +26,6 @@
     ***** END LICENSE BLOCK *****
 */
 
-var { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 XPCOMUtils.defineLazyModuleGetters(globalThis, {
 	Subprocess: "resource://gre/modules/Subprocess.jsm",
 });
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index da507aec77..7bd11929b3 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -32,6 +32,7 @@ Components.classes["@mozilla.org/net/osfileconstantsservice;1"]
 	.getService(Components.interfaces.nsIOSFileConstantsService)
 	.init();
 
+const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetters(globalThis, {
 	AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
 });
diff --git a/chrome/content/zotero/zotero.mjs b/chrome/content/zotero/zotero.mjs
new file mode 100644
index 0000000000..71fad6312d
--- /dev/null
+++ b/chrome/content/zotero/zotero.mjs
@@ -0,0 +1,425 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2023 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+const Cu = Components.utils;
+
+/** XPCOM files to be loaded for all modes **/
+const xpcomFilesAll = [
+	'zotero',
+	'intl',
+	'prefs',
+	'dataDirectory',
+	'debug',
+	'error',
+	'utilities/date',
+	'utilities/utilities',
+	'utilities/utilities_item',
+	'utilities/openurl',
+	'utilities/xregexp-all',
+	'utilities/xregexp-unicode-zotero',
+	'utilities_internal',
+	'translate/src/utilities_translate',
+	'file',
+	'http',
+	'mimeTypeHandler',
+	'pdfWorker/manager',
+	'ipc',
+	'prompt',
+	'profile',
+	'progressWindow',
+	'proxy',
+	'translate/src/translation/translate',
+	'translate/src/translator',
+	'translate/src/tlds',
+	'translation/translate_firefox',
+	'isbn',
+	'preferencePanes',
+	'uiProperties',
+];
+
+/** XPCOM files to be loaded only for local translation and DB access **/
+const xpcomFilesLocal = [
+	'collectionTreeRow',
+	'annotations',
+	'api',
+	'attachments',
+	'browserDownload',
+	'cite',
+	'citeprocRsBridge',
+	'cookieSandbox',
+	'data/library',
+	'data/libraries',
+	'data/dataObject',
+	'data/dataObjects',
+	'data/dataObjectUtilities',
+	'data/cachedTypes',
+	'data/notes',
+	'data/item',
+	'data/items',
+	'data/collection',
+	'data/collections',
+	'data/feedItem',
+	'data/feedItems',
+	'data/feed',
+	'data/feeds',
+	'data/creators',
+	'data/group',
+	'data/groups',
+	'data/itemFields',
+	'data/relations',
+	'data/search',
+	'data/searchConditions',
+	'data/searches',
+	'data/tags',
+	'db',
+	'dictionaries',
+	'duplicates',
+	'editorInstance',
+	'feedReader',
+	'fileDragDataProvider',
+	'fulltext',
+	'id',
+	'integration',
+	'itemTreeManager',
+	'locale',
+	'locateManager',
+	'mime',
+	'notifier',
+	'fileHandlers',
+	'plugins',
+	'reader',
+	'progressQueue',
+	'progressQueueDialog',
+	'quickCopy',
+	'recognizeDocument',
+	'report',
+	'retractions',
+	'router',
+	'schema',
+	'server',
+	'server_integration',
+	'session',
+	'streamer',
+	'style',
+	'sync',
+	'sync/syncAPIClient',
+	'sync/syncEngine',
+	'sync/syncExceptions',
+	'sync/syncEventListeners',
+	'sync/syncFullTextEngine',
+	'sync/syncLocal',
+	'sync/syncRunner',
+	'sync/syncUtilities',
+	'storage',
+	'storage/storageEngine',
+	'storage/storageLocal',
+	'storage/storageRequest',
+	'storage/storageResult',
+	'storage/storageUtilities',
+	'storage/streamListener',
+	'storage/zfs',
+	'storage/webdav',
+	'syncedSettings',
+	'timeline',
+	'uri',
+	'users',
+	'translation/translate_item',
+	'translation/translators',
+	'connector/httpIntegrationClient',
+	'connector/server_connector',
+	'connector/server_connectorIntegration',
+];
+
+Components.utils.import("resource://gre/modules/ComponentUtils.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/content/modules/commandLineOptions.mjs");
+
+var instanceID = (new Date()).getTime();
+var isFirstLoadThisSession = true;
+var zContext = null;
+var initCallbacks = [];
+
+// Components.utils.import('resource://zotero/require.js');
+// Not using Cu.import here since we don't want the require module to be cached
+// for includes within ZoteroPane or other code, where we want the window instance available to modules.
+Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+	.getService(Components.interfaces.mozIJSSubScriptLoader)
+	.loadSubScript('resource://zotero/require.js');
+
+var ZoteroContext = function() {}
+ZoteroContext.prototype = {
+	require,
+	
+	/**
+	 * Shuts down Zotero, calls a callback (that may return a promise),
+	 * then reinitializes Zotero. Returns a promise that is resolved
+	 * when this process completes.
+	 */
+	reinit: function (cb, options = {}) {
+		Services.obs.notifyObservers(zContext.Zotero, "zotero-before-reload");
+		return zContext.Zotero.shutdown().then(function() {
+			return cb ? cb() : false;
+		}).finally(function() {
+			makeZoteroContext();
+			var o = {};
+			Object.assign(o, CommandLineOptions);
+			Object.assign(o, options);
+			return zContext.Zotero.init(o);
+		});
+	}
+};
+
+const { XPCOMUtils } = ChromeUtils.import(
+	"resource://gre/modules/XPCOMUtils.jsm"
+);
+XPCOMUtils.defineLazyModuleGetters(ZoteroContext.prototype, {
+	setTimeout: "resource://gre/modules/Timer.jsm",
+	clearTimeout: "resource://gre/modules/Timer.jsm",
+	setInterval: "resource://gre/modules/Timer.jsm",
+	clearInterval: "resource://gre/modules/Timer.jsm",
+	requestIdleCallback: "resource://gre/modules/Timer.jsm",
+	cancelIdleCallback: "resource://gre/modules/Timer.jsm",
+});
+
+/**
+ * The class from which the Zotero global XPCOM context is constructed
+ *
+ * @constructor
+ * This runs when ZoteroService is first requested to load all applicable scripts and initialize
+ * Zotero. Calls to other XPCOM components must be in here rather than in top-level code, as other
+ * components may not have yet been initialized.
+ */
+function makeZoteroContext() {
+	if(zContext) {
+		// Swap out old zContext
+		var oldzContext = zContext;
+		// Create new zContext
+		zContext = new ZoteroContext();
+		// Swap in old Zotero object, so that references don't break, but empty it
+		zContext.Zotero = oldzContext.Zotero;
+		for(var key in zContext.Zotero) delete zContext.Zotero[key];
+	} else {
+		zContext = new ZoteroContext();
+		zContext.Zotero = function() {};
+	}
+	
+	var subscriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+	
+	// Load zotero.js first
+	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFilesAll[0] + ".js", zContext, 'utf-8');
+	
+	// Load CiteProc into Zotero.CiteProc namespace
+	zContext.Zotero.CiteProc = {"Zotero":zContext.Zotero};
+	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/citeproc.js", zContext.Zotero.CiteProc, 'utf-8');
+	
+	// Load XRegExp object into Zotero.XRegExp
+	const xregexpFiles = [
+		/**Core functions**/
+		'xregexp-all',
+		'xregexp-unicode-zotero'				//adds support for some Unicode categories used in Zotero
+	];
+	for (var i=0; i<xregexpFiles.length; i++) {
+		subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/utilities/" + xregexpFiles[i] + ".js", zContext, 'utf-8');
+	}
+	
+	// Load remaining xpcomFiles
+	for (var i=1; i<xpcomFilesAll.length; i++) {
+		try {
+			subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFilesAll[i] + ".js", zContext, 'utf-8');
+		}
+		catch (e) {
+			Components.utils.reportError("Error loading " + xpcomFilesAll[i] + ".js");
+			throw (e);
+		}
+	}
+	
+	// Load xpcomFiles for specific mode
+	for (let xpcomFile of xpcomFilesLocal) {
+		try {
+			subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFile + ".js", zContext, "utf-8");
+		}
+		catch (e) {
+			dump("Error loading " + xpcomFile + ".js\n\n");
+			dump(e + "\n\n");
+			Components.utils.reportError("Error loading " + xpcomFile + ".js");
+			throw (e);
+		}
+	}
+	
+	// Load RDF files into Zotero.RDF.AJAW namespace (easier than modifying all of the references)
+	const rdfXpcomFiles = [
+		'rdf/init',
+		'rdf/uri',
+		'rdf/term',
+		'rdf/identity',
+		'rdf/n3parser',
+		'rdf/rdfparser',
+		'rdf/serialize'
+	];
+	zContext.Zotero.RDF = {Zotero:zContext.Zotero};
+	for (var i=0; i<rdfXpcomFiles.length; i++) {
+		subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/translate/src/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF, 'utf-8');
+	}
+	
+	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/standalone.js", zContext);
+	
+	// add connector-related properties
+	zContext.Zotero.instanceID = instanceID;
+	zContext.Zotero.__defineGetter__("isFirstLoadThisSession", function() { return isFirstLoadThisSession; });
+};
+
+/**
+ * The class representing the Zotero service, and affiliated XPCOM goop
+ */
+try {
+	var start = Date.now();
+	
+	if(isFirstLoadThisSession) {
+		makeZoteroContext(false);
+		zContext.Zotero.init(CommandLineOptions)
+		.catch(function (e) {
+			dump(e + "\n\n");
+			Components.utils.reportError(e);
+			if (!zContext.Zotero.startupError) {
+				zContext.Zotero.startupError = e.stack || e;
+			}
+		})
+		.then(async function () {
+			if (zContext.Zotero.startupErrorHandler || zContext.Zotero.startupError) {
+				if (zContext.Zotero.startupErrorHandler) {
+					await zContext.Zotero.startupErrorHandler();
+				}
+				else if (zContext.Zotero.startupError) {
+					// Try to repair the DB on the next startup, in case it helps resolve
+					// the error
+					try {
+						zContext.Zotero.Schema.setIntegrityCheckRequired(true);
+					}
+					catch (e) {}
+					
+					try {
+						zContext.Zotero.startupError =
+							zContext.Zotero.Utilities.Internal.filterStack(
+								zContext.Zotero.startupError
+							);
+					}
+					catch (e) {}
+					
+					let ps = Services.prompt;
+					let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
+						+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING);
+					// Get the stringbundle manually
+					let errorStr = "Error";
+					let quitStr = "Quit";
+					let checkForUpdateStr = "Check for Update";
+					try {
+						let src = 'chrome://zotero/locale/zotero.properties';
+						let stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
+							.getService(Components.interfaces.nsIStringBundleService);
+						let stringBundle = stringBundleService.createBundle(src);
+						errorStr = stringBundle.GetStringFromName('general.error');
+						checkForUpdateStr = stringBundle.GetStringFromName('general.checkForUpdate');
+						quitStr = stringBundle.GetStringFromName('general.quit');
+					}
+					catch (e) {}
+					let index = ps.confirmEx(
+						null,
+						errorStr,
+						zContext.Zotero.startupError,
+						buttonFlags,
+						checkForUpdateStr,
+						quitStr,
+						null,
+						null,
+						{}
+					);
+					if (index == 0) {
+						Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+							.getService(Components.interfaces.nsIWindowWatcher)
+							.openWindow(null, 'chrome://mozapps/content/update/updates.xhtml',
+								'updateChecker', 'chrome,centerscreen,modal', null);
+					}
+				}
+				zContext.Zotero.Utilities.Internal.quitZotero();
+			}
+		});
+		
+		let cb;
+		while (cb = initCallbacks.shift()) {
+			cb(zContext.Zotero);
+		}
+	}
+	else {
+		zContext.Zotero.debug("Already initialized");
+	}
+	//this.wrappedJSObject = zContext.Zotero;
+}
+catch (e) {
+	var msg = e instanceof Error
+		? e.name + ': ' + e.message + '\n' + e.fileName + ':' + e.lineNumber + '\n' + e.stack
+		: '' + e;
+	dump(msg + '\n');
+	Components.utils.reportError(e);
+	throw e;
+}
+
+function addInitCallback(callback) {
+	if (zContext && zContext.Zotero) {
+		callback(zContext.Zotero);
+	}
+	else {
+		initCallbacks.push(callback);
+	}
+}
+
+/**
+ * Determine whether Zotero Standalone is running
+ */
+function isStandalone() {
+	return true;
+}
+
+function getOS() {
+	return Services.appinfo.OS;
+}
+
+function isMac() {
+	return getOS() == "Darwin";
+}
+
+function isWin() {
+	return getOS() == "WINNT";
+}
+
+function isLinux() {
+	return getOS() == "Linux";
+}
+
+
+export const Zotero = zContext.Zotero;
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 71988113cb..5441038dba 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -60,7 +60,7 @@
 	<script>
 		var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 		
-		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 		
 		Services.scriptloader.loadSubScript("resource://zotero/require.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/standalone/standalone.js", this);
diff --git a/components/zotero-service.js b/components/zotero-service.js
index f7b1f25aa2..cb4cafef57 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -27,451 +27,6 @@
     ***** END LICENSE BLOCK *****
 */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-/** XPCOM files to be loaded for all modes **/
-const xpcomFilesAll = [
-	'zotero',
-	'intl',
-	'prefs',
-	'dataDirectory',
-	'debug',
-	'error',
-	'utilities/date',
-	'utilities/utilities',
-	'utilities/utilities_item',
-	'utilities/openurl',
-	'utilities/xregexp-all',
-	'utilities/xregexp-unicode-zotero',
-	'utilities_internal',
-	'translate/src/utilities_translate',
-	'file',
-	'http',
-	'mimeTypeHandler',
-	'pdfWorker/manager',
-	'ipc',
-	'prompt',
-	'profile',
-	'progressWindow',
-	'proxy',
-	'translate/src/translation/translate',
-	'translate/src/translator',
-	'translate/src/tlds',
-	'translation/translate_firefox',
-	'isbn',
-	'preferencePanes',
-	'uiProperties',
-];
-
-/** XPCOM files to be loaded only for local translation and DB access **/
-const xpcomFilesLocal = [
-	'collectionTreeRow',
-	'annotations',
-	'api',
-	'attachments',
-	'browserDownload',
-	'cite',
-	'citeprocRsBridge',
-	'cookieSandbox',
-	'data/library',
-	'data/libraries',
-	'data/dataObject',
-	'data/dataObjects',
-	'data/dataObjectUtilities',
-	'data/cachedTypes',
-	'data/notes',
-	'data/item',
-	'data/items',
-	'data/collection',
-	'data/collections',
-	'data/feedItem',
-	'data/feedItems',
-	'data/feed',
-	'data/feeds',
-	'data/creators',
-	'data/group',
-	'data/groups',
-	'data/itemFields',
-	'data/relations',
-	'data/search',
-	'data/searchConditions',
-	'data/searches',
-	'data/tags',
-	'db',
-	'dictionaries',
-	'duplicates',
-	'editorInstance',
-	'feedReader',
-	'fileDragDataProvider',
-	'fulltext',
-	'id',
-	'integration',
-	'locale',
-	'locateManager',
-	'mime',
-	'notifier',
-	'fileHandlers',
-	'plugins',
-	'reader',
-	'progressQueue',
-	'progressQueueDialog',
-	'quickCopy',
-	'recognizeDocument',
-	'report',
-	'retractions',
-	'router',
-	'schema',
-	'server',
-	'server_integration',
-	'session',
-	'streamer',
-	'style',
-	'sync',
-	'sync/syncAPIClient',
-	'sync/syncEngine',
-	'sync/syncExceptions',
-	'sync/syncEventListeners',
-	'sync/syncFullTextEngine',
-	'sync/syncLocal',
-	'sync/syncRunner',
-	'sync/syncUtilities',
-	'storage',
-	'storage/storageEngine',
-	'storage/storageLocal',
-	'storage/storageRequest',
-	'storage/storageResult',
-	'storage/storageUtilities',
-	'storage/streamListener',
-	'storage/zfs',
-	'storage/webdav',
-	'syncedSettings',
-	'timeline',
-	'uri',
-	'users',
-	'translation/translate_item',
-	'translation/translators',
-	'connector/httpIntegrationClient',
-	'connector/server_connector',
-	'connector/server_connectorIntegration',
-	'itemTreeManager',
-];
-
-Components.utils.import("resource://gre/modules/ComponentUtils.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var instanceID = (new Date()).getTime();
-var isFirstLoadThisSession = true;
-var zContext = null;
-var initCallbacks = [];
-var zInitOptions = {};
-
-// Components.utils.import('resource://zotero/require.js');
-// Not using Cu.import here since we don't want the require module to be cached
-// for includes within ZoteroPane or other code, where we want the window instance available to modules.
-Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
-	.getService(Components.interfaces.mozIJSSubScriptLoader)
-	.loadSubScript('resource://zotero/require.js');
-
-var ZoteroContext = function() {}
-ZoteroContext.prototype = {
-	require,
-	
-	/**
-	 * Convenience method to replicate window.alert()
-	 **/
-	// TODO: is this still used? if so, move to zotero.js
-	"alert":function alert(msg){
-		this.Zotero.debug("alert() is deprecated from Zotero XPCOM");
-		Cc["@mozilla.org/embedcomp/prompt-service;1"]
-			.getService(Ci.nsIPromptService)
-			.alert(null, "", msg);
-	},
-	
-	/**
-	 * Convenience method to replicate window.confirm()
-	 **/
-	// TODO: is this still used? if so, move to zotero.js
-	"confirm":function confirm(msg){
-		this.Zotero.debug("confirm() is deprecated from Zotero XPCOM");
-		return Cc["@mozilla.org/embedcomp/prompt-service;1"]
-			.getService(Ci.nsIPromptService)
-			.confirm(null, "", msg);
-	},
-	
-	"Cc":Cc,
-	"Ci":Ci,
-	
-	/**
-	 * Switches in or out of connector mode
-	 */
-	"switchConnectorMode":function(isConnector) {
-		if(isConnector !== this.isConnector) {
-			Services.obs.notifyObservers(zContext.Zotero, "zotero-before-reload", isConnector ? "connector" : "full");
-			zContext.Zotero.shutdown().then(function() {
-				// create a new zContext
-				makeZoteroContext(isConnector);
-				return zContext.Zotero.init(zInitOptions);
-			}).done();
-		}
-		
-		return zContext;
-	},
-
-	/**
-	 * Shuts down Zotero, calls a callback (that may return a promise),
-	 * then reinitializes Zotero. Returns a promise that is resolved
-	 * when this process completes.
-	 */
-	"reinit":function(cb, isConnector, options = {}) {
-		Services.obs.notifyObservers(zContext.Zotero, "zotero-before-reload", isConnector ? "connector" : "full");
-		return zContext.Zotero.shutdown().then(function() {
-			return cb ? cb() : false;
-		}).finally(function() {
-			makeZoteroContext(isConnector);
-			var o = {};
-			Object.assign(o, zInitOptions);
-			Object.assign(o, options);
-			return zContext.Zotero.init(o);
-		});
-	}
-};
-
-const { XPCOMUtils } = ChromeUtils.import(
-	"resource://gre/modules/XPCOMUtils.jsm"
-);
-XPCOMUtils.defineLazyModuleGetters(ZoteroContext.prototype, {
-	setTimeout: "resource://gre/modules/Timer.jsm",
-	clearTimeout: "resource://gre/modules/Timer.jsm",
-	setInterval: "resource://gre/modules/Timer.jsm",
-	clearInterval: "resource://gre/modules/Timer.jsm",
-	requestIdleCallback: "resource://gre/modules/Timer.jsm",
-	cancelIdleCallback: "resource://gre/modules/Timer.jsm",
-});
-
-/**
- * The class from which the Zotero global XPCOM context is constructed
- *
- * @constructor
- * This runs when ZoteroService is first requested to load all applicable scripts and initialize
- * Zotero. Calls to other XPCOM components must be in here rather than in top-level code, as other
- * components may not have yet been initialized.
- */
-function makeZoteroContext(isConnector) {
-	if(zContext) {
-		// Swap out old zContext
-		var oldzContext = zContext;
-		// Create new zContext
-		zContext = new ZoteroContext();
-		// Swap in old Zotero object, so that references don't break, but empty it
-		zContext.Zotero = oldzContext.Zotero;
-		for(var key in zContext.Zotero) delete zContext.Zotero[key];
-	} else {
-		zContext = new ZoteroContext();
-		zContext.Zotero = function() {};
-	}
-	
-	var subscriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
-	
-	// Load zotero.js first
-	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFilesAll[0] + ".js", zContext, 'utf-8');
-	
-	// Load CiteProc into Zotero.CiteProc namespace
-	zContext.Zotero.CiteProc = {"Zotero":zContext.Zotero};
-	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/citeproc.js", zContext.Zotero.CiteProc, 'utf-8');
-	
-	// Load XRegExp object into Zotero.XRegExp
-	const xregexpFiles = [
-		/**Core functions**/
-		'xregexp-all',
-		'xregexp-unicode-zotero'				//adds support for some Unicode categories used in Zotero
-	];
-	for (var i=0; i<xregexpFiles.length; i++) {
-		subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/utilities/" + xregexpFiles[i] + ".js", zContext, 'utf-8');
-	}
-	
-	// Load remaining xpcomFiles
-	for (var i=1; i<xpcomFilesAll.length; i++) {
-		try {
-			subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFilesAll[i] + ".js", zContext, 'utf-8');
-		}
-		catch (e) {
-			Components.utils.reportError("Error loading " + xpcomFilesAll[i] + ".js", zContext);
-			throw (e);
-		}
-	}
-	
-	// Load xpcomFiles for specific mode
-	for (let xpcomFile of (isConnector ? xpcomFilesConnector : xpcomFilesLocal)) {
-		try {
-			subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFile + ".js", zContext, "utf-8");
-		}
-		catch (e) {
-			dump("Error loading " + xpcomFile + ".js\n\n");
-			dump(e + "\n\n");
-			Components.utils.reportError("Error loading " + xpcomFile + ".js");
-			throw (e);
-		}
-	}
-	
-	// Load RDF files into Zotero.RDF.AJAW namespace (easier than modifying all of the references)
-	const rdfXpcomFiles = [
-		'rdf/init',
-		'rdf/uri',
-		'rdf/term',
-		'rdf/identity',
-		'rdf/n3parser',
-		'rdf/rdfparser',
-		'rdf/serialize'
-	];
-	zContext.Zotero.RDF = {Zotero:zContext.Zotero};
-	for (var i=0; i<rdfXpcomFiles.length; i++) {
-		subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/translate/src/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF, 'utf-8');
-	}
-	
-	subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/standalone.js", zContext);
-	
-	// add connector-related properties
-	zContext.Zotero.isConnector = isConnector;
-	zContext.Zotero.instanceID = instanceID;
-	zContext.Zotero.__defineGetter__("isFirstLoadThisSession", function() { return isFirstLoadThisSession; });
-};
-
-/**
- * The class representing the Zotero service, and affiliated XPCOM goop
- */
-function ZoteroService() {
-	try {
-		var start = Date.now();
-		
-		if(isFirstLoadThisSession) {
-			makeZoteroContext(false);
-			zContext.Zotero.init(zInitOptions)
-			.catch(function (e) {
-				dump(e + "\n\n");
-				Components.utils.reportError(e);
-				if (!zContext.Zotero.startupError) {
-					zContext.Zotero.startupError = e.stack || e;
-				}
-			})
-			.then(async function () {
-				if (zContext.Zotero.startupErrorHandler || zContext.Zotero.startupError) {
-					if (zContext.Zotero.startupErrorHandler) {
-						await zContext.Zotero.startupErrorHandler();
-					}
-					else if (zContext.Zotero.startupError) {
-						// Try to repair the DB on the next startup, in case it helps resolve
-						// the error
-						try {
-							zContext.Zotero.Schema.setIntegrityCheckRequired(true);
-						}
-						catch (e) {}
-						
-						try {
-							zContext.Zotero.startupError =
-								zContext.Zotero.Utilities.Internal.filterStack(
-									zContext.Zotero.startupError
-								);
-						}
-						catch (e) {}
-						
-						let ps = Cc["@mozilla.org/embedcomp/prompt-service;1"]
-							.getService(Ci.nsIPromptService);
-						let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
-							+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING);
-						// Get the stringbundle manually
-						let errorStr = "Error";
-						let quitStr = "Quit";
-						let checkForUpdateStr = "Check for Update";
-						try {
-							let src = 'chrome://zotero/locale/zotero.properties';
-							let stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
-								.getService(Components.interfaces.nsIStringBundleService);
-							let stringBundle = stringBundleService.createBundle(src);
-							errorStr = stringBundle.GetStringFromName('general.error');
-							checkForUpdateStr = stringBundle.GetStringFromName('general.checkForUpdate');
-							quitStr = stringBundle.GetStringFromName('general.quit');
-						}
-						catch (e) {}
-						let index = ps.confirmEx(
-							null,
-							errorStr,
-							zContext.Zotero.startupError,
-							buttonFlags,
-							checkForUpdateStr,
-							quitStr,
-							null,
-							null,
-							{}
-						);
-						if (index == 0) {
-							Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-								.getService(Components.interfaces.nsIWindowWatcher)
-								.openWindow(null, 'chrome://zotero/content/update/updates.xhtml',
-									'updateChecker', 'chrome,centerscreen,modal', null);
-						}
-					}
-					zContext.Zotero.Utilities.Internal.quitZotero();
-				}
-			});
-			
-			let cb;
-			while (cb = initCallbacks.shift()) {
-				cb(zContext.Zotero);
-			}
-		}
-		else {
-			zContext.Zotero.debug("Already initialized");
-		}
-		this.wrappedJSObject = zContext.Zotero;
-	} catch(e) {
-		var msg = e instanceof Error
-			? e.name + ': ' + e.message + '\n' + e.fileName + ':' + e.lineNumber + '\n' + e.stack
-			: '' + e;
-		dump(msg + '\n');
-		Components.utils.reportError(e);
-		throw e;
-	}
-}
-ZoteroService.prototype = {
-	classID: Components.ID('{e4c61080-ec2d-11da-8ad9-0800200c9a66}'),
-	QueryInterface: ChromeUtils.generateQI([])
-}
-
-function addInitCallback(callback) {
-	if (zContext && zContext.Zotero) {
-		callback(zContext.Zotero);
-	}
-	else {
-		initCallbacks.push(callback);
-	}
-}
-
-/**
- * Determine whether Zotero Standalone is running
- */
-function isStandalone() {
-	return true;
-}
-
-function getOS() {
-	return Services.appinfo.OS;
-}
-
-function isMac() {
-	return getOS() == "Darwin";
-}
-
-function isWin() {
-	return getOS() == "WINNT";
-}
-
-function isLinux() {
-	return getOS() == "Linux";
-}
-
 /**
  * The class representing the Zotero command line handler
  */