Cherry pick promise-polyfill

lib/assets/javascripts/builder/dataset.js

@@ -4,6 +4,7 @@ if (ACTIVE_LOCALE !== 'en') {
 }
 var Locale = require('locale/index');
 var Polyglot = require('node-polyglot');
+require('promise-polyfill');
 var polyglot = new Polyglot({
   locale: ACTIVE_LOCALE, // Needed for pluralize behaviour
   phrases: Locale[ACTIVE_LOCALE]

lib/assets/javascripts/builder/editor.js

@@ -4,6 +4,7 @@ if (ACTIVE_LOCALE !== 'en') {
 }
 var Locale = require('locale/index');
 var Polyglot = require('node-polyglot');
+require('promise-polyfill');
 var polyglot = new Polyglot({
   locale: ACTIVE_LOCALE, // Needed for pluralize behaviour
   phrases: Locale[ACTIVE_LOCALE]

lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js

@@ -3,7 +3,7 @@
  *  if necessary
  */
 
-module.exports = function (params, callback) {
+module.exports = function (params) {
   if (!params) throw new Error('all query objects are required');
   if (!params.querySchemaModel) throw new Error('querySchemaModel is required');
   if (!params.queryGeometryModel) throw new Error('queryGeometryModel is required');

lib/assets/javascripts/builder/public_editor.js

@@ -1,4 +1,5 @@
 require('whatwg-fetch');
+require('promise-polyfill');
 
 var FastClick = require('fastclick');
 FastClick.attach(document.body);

lib/build/affectedFiles/affectedFiles.js

@@ -45,7 +45,6 @@ var fs = require('fs-extra');
 var colors = require('colors');
 var recursive = require('recursive-readdir');
 var minimist = require('minimist');
-var Promise = require('bluebird');
 var _ = require('underscore');
 var FileTrie = require('./fileTrie');
 

lib/build/affectedFiles/fetchRequires.js

@@ -1,6 +1,5 @@
 var fs = require('fs-extra');
 var path = require('path');
-var Promise = require('bluebird');
 var config = require('./fetchRequires.config.js');
 
 function checkConfig () {

lib/build/branchFiles/modifiedFiles.js

@@ -2,7 +2,6 @@ var child = require('child_process');
 var path = require('path');
 var fs = require('fs');
 var recursive = require('recursive-readdir');
-var Promise = require('bluebird');
 var _ = require('underscore');
 
 /**

package.json

@@ -42,6 +42,7 @@
     "postcss": "5.0.19",
     "postcss-scss": "0.4.0",
     "postcss-strip-inline-comments": "0.1.5",
+    "promise-polyfill": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
     "queue-async": "1.2.1",
     "rangeslider.js": "2.3.0",
     "tinycolor2": "^1.4.1",