From e613e9ccb3f85312de4aee3ca0dde6d6d512f910 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 11 Mar 2016 17:11:56 -0500
Subject: [PATCH] Modularize the promise package.

---
 packages/promise/.npm/package/npm-shrinkwrap.json |  2 +-
 packages/promise/main.js                          |  6 ++++++
 packages/promise/package.js                       | 15 ++++-----------
 packages/promise/promise-tests.js                 |  2 +-
 packages/promise/promise_server.js                |  5 -----
 5 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 packages/promise/main.js
 delete mode 100644 packages/promise/promise_server.js

diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
index f394dc690e..a1ddbaf90f 100644
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ b/packages/promise/.npm/package/npm-shrinkwrap.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "meteor-promise": {
-      "version": "0.5.0",
+      "version": "0.6.2",
       "dependencies": {
         "promise": {
           "version": "7.0.4",
diff --git a/packages/promise/main.js b/packages/promise/main.js
new file mode 100644
index 0000000000..07f3512491
--- /dev/null
+++ b/packages/promise/main.js
@@ -0,0 +1,6 @@
+exports.Promise = require("meteor-promise");
+if (Meteor.isServer) {
+  // Define MeteorPromise.Fiber so that every Promise callback can run in
+  // a Fiber drawn from a pool of reusable Fibers.
+  exports.Promise.Fiber = require("fibers");
+}
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 08a48d64a6..d7abaff814 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,25 +1,18 @@
 Package.describe({
   name: "promise",
-  version: "0.5.2-beta.16",
+  version: "0.6.2-beta.16",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "meteor-promise": "0.5.0"
+  "meteor-promise": "0.6.2"
 });
 
 Package.onUse(function(api) {
-  api.addFiles("promise_server.js", "server");
-
-  api.addFiles(
-    // This may not be the most robust way of referring to an NPM asset,
-    // but at least api.addFiles will fail if the file does not exist.
-    ".npm/package/node_modules/meteor-promise/promise.bundle.js",
-    "client"
-  );
-
+  api.use("modules");
+  api.mainModule("main.js");
   api.export("Promise");
 });
 
diff --git a/packages/promise/promise-tests.js b/packages/promise/promise-tests.js
index c1cc6020ef..b631e1819e 100644
--- a/packages/promise/promise-tests.js
+++ b/packages/promise/promise-tests.js
@@ -6,7 +6,7 @@ Tinytest.addAsync("meteor-promise - sanity", function (test, done) {
   }).catch(function (error) {
     test.equal(error, expectedError);
     if (Meteor.isServer) {
-      var Fiber = Npm.require("fibers");
+      var Fiber = require("fibers");
       // Make sure the Promise polyfill runs callbacks in a Fiber.
       test.instanceOf(Fiber.current, Fiber);
     }
diff --git a/packages/promise/promise_server.js b/packages/promise/promise_server.js
deleted file mode 100644
index 9364a3e808..0000000000
--- a/packages/promise/promise_server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var MeteorPromise = Npm.require("meteor-promise");
-// Define MeteorPromise.Fiber so that every Promise callback can run in a
-// Fiber drawn from a pool of reusable Fibers.
-MeteorPromise.Fiber = Npm.require("fibers");
-Promise = MeteorPromise;