Fix promise global pollution

src/coordinator.js

@@ -2,6 +2,7 @@ import cluster from 'cluster';
 import os from 'os';
 
 import './environment';
+import Promise from './promise';
 import logger from './utils/logger';
 import { raceTo } from './utils/lifecycle';
 

src/environment.js

@@ -1,26 +1,2 @@
 /* eslint func-names:0 no-extra-parens:0  */
 import 'airbnb-js-shims';
-import Promise from 'bluebird';
-
-const es6methods = ['then', 'catch', 'constructor'];
-const es6StaticMethods = ['all', 'race', 'resolve', 'reject', 'cast'];
-
-function isNotMethod(name) {
-  return !(es6methods.includes(name) || es6StaticMethods.includes(name) || name.charAt(0) === '_');
-}
-
-function del(obj) {
-  /* eslint no-param-reassign: 0 */
-  return (key) => { delete obj[key]; };
-}
-
-function toFastProperties(obj) {
-  (function () {}).prototype = obj;
-}
-
-Object.keys(Promise.prototype).filter(isNotMethod).forEach(del(Promise.prototype));
-Object.keys(Promise).filter(isNotMethod).forEach(del(Promise));
-toFastProperties(Promise);
-toFastProperties(Promise.prototype);
-
-global.Promise = Promise;

src/promise.js

@@ -0,0 +1,25 @@
+/* eslint func-names:0 no-extra-parens:0  */
+import Promise from 'bluebird';
+
+const es6methods = ['then', 'catch', 'constructor'];
+const es6StaticMethods = ['all', 'race', 'resolve', 'reject', 'cast'];
+
+function isNotMethod(name) {
+  return !(es6methods.includes(name) || es6StaticMethods.includes(name) || name.charAt(0) === '_');
+}
+
+function del(obj) {
+  /* eslint no-param-reassign: 0 */
+  return (key) => { delete obj[key]; };
+}
+
+function toFastProperties(obj) {
+  (function () {}).prototype = obj;
+}
+
+Object.keys(Promise.prototype).filter(isNotMethod).forEach(del(Promise.prototype));
+Object.keys(Promise).filter(isNotMethod).forEach(del(Promise));
+toFastProperties(Promise);
+toFastProperties(Promise.prototype);
+
+export default Promise;

src/utils/BatchManager.js

@@ -1,3 +1,5 @@
+import Promise from '../promise';
+
 const noHTMLError = new TypeError(
   'HTML was not returned to Hypernova, this is most likely an error within your application. Check your logs for any uncaught errors and/or rejections.',
 );

src/utils/lifecycle.js

@@ -1,3 +1,4 @@
+import Promise from '../promise';
 import logger from './logger';
 
 const MAX_LIFECYCLE_EXECUTION_TIME_IN_MS = 300;

src/worker.js

@@ -1,6 +1,7 @@
 import bodyParser from 'body-parser';
 
 import './environment';
+import Promise from './promise';
 import logger from './utils/logger';
 import renderBatch from './utils/renderBatch';
 import { runAppLifecycle, errorSync, raceTo } from './utils/lifecycle';