From fdf6a5b7ef20a770ac239f64cfa2e75623b0c0f8 Mon Sep 17 00:00:00 2001
From: Ivan Malagon <hacheka@gmail.com>
Date: Wed, 28 Feb 2018 12:50:26 +0100
Subject: [PATCH] Cherry pick promise-polyfill

---
 lib/assets/javascripts/builder/dataset.js                       | 1 +
 lib/assets/javascripts/builder/editor.js                        | 1 +
 .../javascripts/builder/helpers/fetch-all-query-objects.js      | 2 +-
 lib/assets/javascripts/builder/public_editor.js                 | 1 +
 lib/build/affectedFiles/affectedFiles.js                        | 1 -
 lib/build/affectedFiles/fetchRequires.js                        | 1 -
 lib/build/branchFiles/modifiedFiles.js                          | 1 -
 package.json                                                    | 1 +
 8 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/assets/javascripts/builder/dataset.js b/lib/assets/javascripts/builder/dataset.js
index 8f10cd3222..5424f5645a 100755
--- a/lib/assets/javascripts/builder/dataset.js
+++ b/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]
diff --git a/lib/assets/javascripts/builder/editor.js b/lib/assets/javascripts/builder/editor.js
index 74490537c8..4a55572529 100755
--- a/lib/assets/javascripts/builder/editor.js
+++ b/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]
diff --git a/lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js b/lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js
index 535357f36d..6c538859f0 100644
--- a/lib/assets/javascripts/builder/helpers/fetch-all-query-objects.js
+++ b/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');
diff --git a/lib/assets/javascripts/builder/public_editor.js b/lib/assets/javascripts/builder/public_editor.js
index 87f0b34292..f0f9c42a0e 100755
--- a/lib/assets/javascripts/builder/public_editor.js
+++ b/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);
diff --git a/lib/build/affectedFiles/affectedFiles.js b/lib/build/affectedFiles/affectedFiles.js
index d8de71fc9e..9e2d86ce00 100644
--- a/lib/build/affectedFiles/affectedFiles.js
+++ b/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');
 
diff --git a/lib/build/affectedFiles/fetchRequires.js b/lib/build/affectedFiles/fetchRequires.js
index 6999793b41..b459c84f90 100644
--- a/lib/build/affectedFiles/fetchRequires.js
+++ b/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 () {
diff --git a/lib/build/branchFiles/modifiedFiles.js b/lib/build/branchFiles/modifiedFiles.js
index 39bc1fac34..3f676ce0c5 100644
--- a/lib/build/branchFiles/modifiedFiles.js
+++ b/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');
 
 /**
diff --git a/package.json b/package.json
index b01980487b..fd806fcddb 100644
--- a/package.json
+++ b/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",