From 6f8a9cd7115ae4fea798d3afb60cd52ee0043ada Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 6 Apr 2016 09:26:25 -0400
Subject: [PATCH] Load jquery as a peer dependency if installed by app.

Fixes #6626.
---
 packages/jquery/main.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/jquery/main.js b/packages/jquery/main.js
index d34f83f656..3fb3e74b85 100644
--- a/packages/jquery/main.js
+++ b/packages/jquery/main.js
@@ -1,10 +1,16 @@
-var jQuery = require("./jquery.js");
 var global = this;
 
+try {
+  var jQuery = require("jquery");
+} catch (e) {
+  jQuery = require("./jquery.js");
+}
+
 // Provide values for the exported variables of the jquery package.
 exports.$ = exports.jQuery = jQuery;
 
 // There's no stopping legacy code from referring to window.$ or
 // window.jQuery, so we have to keep defining those properties globally,
 // but at least the exports of this package will be reliable.
-global.$ = global.jQuery = jQuery;
+global.$ = global.$ || jQuery;
+global.jQuery = global.jQuery || jQuery;