Modularize the promise package.

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",

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");
+}

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");
 });
 

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);
     }

packages/promise/promise_server.js

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