From 6afc58a62960c64154e35be8fb26bd0fd1a2edd3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 24 May 2017 00:58:41 -0400
Subject: [PATCH] Move require() into ZoteroContext and fix Bluebird module
 path

---
 .babelrc                              |  2 +-
 chrome/content/zotero/xpcom/zotero.js | 16 ----------------
 components/zotero-service.js          | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.babelrc b/.babelrc
index 834ea8f0cb..a9b189fd9a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -25,7 +25,7 @@
     [
       "transform-async-to-module-method",
       {
-        "module": "bluebird/bluebird.js",
+        "module": "resource://zotero/bluebird/bluebird.js",
         "method": "coroutine"
       }
     ],
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 37172f146d..a39be20c93 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -32,22 +32,6 @@ Components.utils.import("resource://gre/modules/PluralForm.jsm");
 
 Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 
-var require = (target) => {
-	var { Loader, Require, Module } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js');
-	var requirer = Module('/', '/');
-	var globals = {};
-
-	Components.utils.import("resource://gre/modules/Timer.jsm", globals);
-
-	var loader = Loader({
-		id: 'zotero/requireminimal',
-		globals
-	});
-
-	return (Require(loader, requirer))(target);
-};
-
-
 /*
  * Core functions
  */
diff --git a/components/zotero-service.js b/components/zotero-service.js
index 5879dc386a..5f3077eba5 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -155,6 +155,21 @@ var zInitOptions = {};
 
 ZoteroContext = function() {}
 ZoteroContext.prototype = {
+	require: (target) => {
+		var { Loader, Require, Module } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js');
+		var requirer = Module('/', '/');
+		var globals = {};
+		
+		Components.utils.import("resource://gre/modules/Timer.jsm", globals);
+		
+		var loader = Loader({
+			id: 'zotero/requireminimal',
+			globals
+		});
+		
+		return (Require(loader, requirer))(target);
+	},
+	
 	/**
 	 * Convenience method to replicate window.alert()
 	 **/