From 301eb65637c61b39161f800f46ce2ac0f213edcc Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 14 Oct 2014 21:11:26 -0700
Subject: [PATCH] Put 'netroute' into dev bundle

---
 meteor                                            |  2 +-
 packages/netroute/.gitignore                      |  1 -
 packages/netroute/.npm/package/.gitignore         |  1 -
 packages/netroute/.npm/package/README             |  7 -------
 .../netroute/.npm/package/npm-shrinkwrap.json     | 15 ---------------
 packages/netroute/package.js                      | 15 ---------------
 packages/netroute/wrapper.js                      |  1 -
 scripts/generate-dev-bundle.sh                    |  1 +
 tools/uniload.js                                  |  1 -
 tools/utils.js                                    |  3 +--
 10 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 packages/netroute/.gitignore
 delete mode 100644 packages/netroute/.npm/package/.gitignore
 delete mode 100644 packages/netroute/.npm/package/README
 delete mode 100644 packages/netroute/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/netroute/package.js
 delete mode 100644 packages/netroute/wrapper.js

diff --git a/meteor b/meteor
index ea3d18db07..f906b52695 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.58
+BUNDLE_VERSION=0.3.59
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/packages/netroute/.gitignore b/packages/netroute/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/netroute/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/netroute/.npm/package/.gitignore b/packages/netroute/.npm/package/.gitignore
deleted file mode 100644
index 3c3629e647..0000000000
--- a/packages/netroute/.npm/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/netroute/.npm/package/README b/packages/netroute/.npm/package/README
deleted file mode 100644
index 3d492553a4..0000000000
--- a/packages/netroute/.npm/package/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated
-when you change this package's NPM dependencies. Commit the files in this
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
-so that others run the same versions of sub-dependencies.
-
-You should NOT check in the node_modules directory that Meteor automatically
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/netroute/.npm/package/npm-shrinkwrap.json b/packages/netroute/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 07ef3acb2b..0000000000
--- a/packages/netroute/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "dependencies": {
-    "netroute": {
-      "version": "0.2.5",
-      "dependencies": {
-        "bindings": {
-          "version": "1.0.0"
-        },
-        "nan": {
-          "version": "1.3.0"
-        }
-      }
-    }
-  }
-}
diff --git a/packages/netroute/package.js b/packages/netroute/package.js
deleted file mode 100644
index 33108ad690..0000000000
--- a/packages/netroute/package.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is a core package instead of in packages/non-core because it
-// needs to be uniloaded from tool.
-Package.describe({
-  summary: "Wrapper for npm netroute module",
-  version: "0.2.5"
-});
-
-Npm.depends({
-  netroute: "0.2.5"
-});
-
-Package.on_use(function (api) {
-  api.export("NpmModuleNetroute", "server");
-  api.addFiles("wrapper.js", "server");
-});
diff --git a/packages/netroute/wrapper.js b/packages/netroute/wrapper.js
deleted file mode 100644
index e1568ef594..0000000000
--- a/packages/netroute/wrapper.js
+++ /dev/null
@@ -1 +0,0 @@
-NpmModuleNetroute = Npm.require("netroute");
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index df5c5a01c8..edd65f4497 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -164,6 +164,7 @@ npm install node-inspector@0.7.4
 npm install progress@1.1.8
 npm install chalk@0.5.1
 npm install sqlite3@3.0.0
+npm install netroute@0.2.5
 
 # Clean up a big zip file it leaves behind.
 npm install phantomjs@1.8.1-1
diff --git a/tools/uniload.js b/tools/uniload.js
index 703b3a8ec6..303ac47d67 100644
--- a/tools/uniload.js
+++ b/tools/uniload.js
@@ -20,7 +20,6 @@ var ROOT_PACKAGES = [
   'minifiers',
   'minimongo',
   'mongo',
-  'netroute',
   'package-version-parser',
   'boilerplate-generator',
   'webapp-hashing',
diff --git a/tools/utils.js b/tools/utils.js
index 3eeb275875..9f8f2f2f41 100644
--- a/tools/utils.js
+++ b/tools/utils.js
@@ -9,6 +9,7 @@ var os = require('os');
 var fs = require('fs');
 var url = require('url');
 var child_process = require('child_process');
+var netroute = require('netroute');
 
 var utils = exports;
 
@@ -54,8 +55,6 @@ var parseUrl = function (str, defaults) {
 
 var ipAddress = function () {
   var uniload = require("./uniload.js");
-  var netroute = uniload.load({ packages: ["netroute"] }).
-        netroute.NpmModuleNetroute;
   var info = netroute.getInfo();
   var defaultRoute = _.findWhere(info.IPv4 || [], { destination: "0.0.0.0" });
   if (! defaultRoute) {