From 3b996599861b5d36d1f71f32ecd0687ce853410d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 20 Jul 2015 22:07:35 -0400
Subject: [PATCH] Upgrade dev bundle meteor-{promise,babel} to latest versions.

The breaking change in the latest version is that the Fiber constructor is
no longer included as a meteor-promise dependency, but must be supplied by
assigning to Promise.Fiber.
---
 meteor                               | 2 +-
 scripts/dev-bundle-server-package.js | 2 +-
 scripts/dev-bundle-tool-package.js   | 4 ++--
 tools/install-babel.js               | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/meteor b/meteor
index ca77eb2f2c7..ba64008328c 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.5.3
+BUNDLE_VERSION=0.5.4
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 1dbca0efb9c..df69c1ef40a 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -21,7 +21,7 @@ var packageJson = {
   version: "0.0.0",
   dependencies: {
     fibers: fibersVersion,
-    "meteor-promise": "0.2.4",
+    "meteor-promise": "0.4.0",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
     // in the package too) because we should consider using lodash instead
     // (and there are backwards-incompatible changes either way).
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index b858a432e63..d2f85fa284c 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -21,8 +21,8 @@ var packageJson = {
   version: "0.0.0",
   dependencies: {
     fibers: fibersVersion,
-    "meteor-babel": "0.3.4",
-    "meteor-promise": "0.2.4",
+    "meteor-babel": "0.4.4",
+    "meteor-promise": "0.4.0",
     // For Map and Set polyfills.
     "core-js": "0.9.18",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
diff --git a/tools/install-babel.js b/tools/install-babel.js
index 4a01f1ff4ed..601ba7eb444 100644
--- a/tools/install-babel.js
+++ b/tools/install-babel.js
@@ -15,6 +15,9 @@ babelRegister(); // #RemoveInProd this line is removed in isopack.js
 // run all its callbacks in Fibers.
 global.Promise = require('meteor-promise');
 
+// Allow all Promise callbacks to be run in a Fiber.
+global.Promise.Fiber = require('fibers');
+
 // Install ES2015-complaint polyfills for Symbol, Map, Set, and String,
 // patching the native implementations if they are available.
 require('core-js/es6/symbol');