Merge pull request #197 from lrqdo/exports_promise

directly exports promise

Author: stefanpenner

dist/es6-promise.min.js

@@ -3,7 +3,7 @@
  * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
  * @license   Licensed under MIT license
  *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
- * @version   3.2.2+35df15ea
+ * @version   3.2.2+39aa2571
  */
 
 (function() {
@@ -940,18 +940,16 @@
     }
     var lib$es6$promise$polyfill$$default = lib$es6$promise$polyfill$$polyfill;
 
-    var lib$es6$promise$umd$$ES6Promise = {
-      'Promise': lib$es6$promise$promise$$default,
-      'polyfill': lib$es6$promise$polyfill$$default
-    };
+    lib$es6$promise$promise$$default.Promise = lib$es6$promise$promise$$default;
+    lib$es6$promise$promise$$default.polyfill = lib$es6$promise$polyfill$$default;
 
     /* global define:true module:true window: true */
     if (typeof define === 'function' && define['amd']) {
-      define(function() { return lib$es6$promise$umd$$ES6Promise; });
+      define(function() { return lib$es6$promise$promise$$default; });
     } else if (typeof module !== 'undefined' && module['exports']) {
-      module['exports'] = lib$es6$promise$umd$$ES6Promise;
+      module['exports'] = lib$es6$promise$promise$$default;
     } else if (typeof this !== 'undefined') {
-      this['ES6Promise'] = lib$es6$promise$umd$$ES6Promise;
+      this['Promise'] = lib$es6$promise$promise$$default;
     }
 
     lib$es6$promise$polyfill$$default();

dist/es6-promise.js renamed to dist/lib/es6-promise.js

@@ -1,18 +1,16 @@
 import Promise from './es6-promise/promise';
 import polyfill from './es6-promise/polyfill';
 
-var ES6Promise = {
-  'Promise': Promise,
-  'polyfill': polyfill
-};
+Promise.Promise = Promise;
+Promise.polyfill = polyfill;
 
 /* global define:true module:true window: true */
 if (typeof define === 'function' && define['amd']) {
-  define(function() { return ES6Promise; });
+  define(function() { return Promise; });
 } else if (typeof module !== 'undefined' && module['exports']) {
-  module['exports'] = ES6Promise;
+  module['exports'] = Promise;
 } else if (typeof this !== 'undefined') {
-  this['ES6Promise'] = ES6Promise;
+  this['ES6Promise'] = Promise;
 }
 
 polyfill();

lib/es6-promise.umd.js

@@ -2,7 +2,11 @@ var assert = require('assert');
 var g = typeof window !== 'undefined' ?
                window : typeof global !== 'undefined' ? global : this;
 
-var Promise = g.ES6Promise || require('./es6-promise').Promise;
+var Promise = g.ES6Promise || require('./es6-promise');
+
+assert(typeof Promise.polyfill === 'function')
+assert(typeof Promise.Promise === 'function')
+assert(Promise.Promise === Promise)
 
 function defer() {
   var deferred = {};