From e14b18eb09b87b44eef2af7b40aeca9bc18c6e19 Mon Sep 17 00:00:00 2001 From: Naomi Seyfer Date: Tue, 3 Sep 2013 17:16:22 -0700 Subject: [PATCH] Actually resolve circular dependency --- packages/webapp/package.js | 4 ++-- packages/webapp/webapp_server.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 9fe9732e0a..fdfc9a11b9 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -8,8 +8,8 @@ Npm.depends({connect: "2.9.0", useragent: "2.0.7"}); Package.on_use(function (api) { - api.use(['livedata', 'logging', 'underscore', 'routepolicy'], 'server'); - api.use(['application-configuration'], { + api.use(['logging', 'underscore', 'routepolicy'], 'server'); + api.use(['application-configuration', 'livedata'], { unordered: true }); // At response serving time, webapp uses browser-policy if it is loaded. If diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 2e72e366ed..1e7deb5fe3 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -498,7 +498,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) { // This is run after packages are loaded (in main) so we can use // DDP.connect. - var proxy = DDP.connect(proxyConfig.proxyEndpoint); + var proxy = Package.livedata.DDP.connect(proxyConfig.proxyEndpoint); var route = process.env.ROUTE; var host = route.split(":")[0]; var port = +route.split(":")[1];