github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actually resolve circular dependency

Browse Source
This commit is contained in:
Naomi Seyfer
2013-09-03 17:16:22 -07:00
committed by Emily Stark
parent 37ad55aaea
commit e14b18eb09
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/webapp/package.js
View File

@@ -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

2
packages/webapp/webapp_server.js
View File

@@ -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];