From 9888535a13e11465ba50f94714bd2117248f0cfa Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 9 Jul 2019 13:56:35 -0400
Subject: [PATCH] use static worker to load mapboxgl

---
 src/legacy/server/csp/index.ts                              | 6 +-----
 .../legacy/plugins/maps/public/components/map/mb/utils.js   | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/legacy/server/csp/index.ts b/src/legacy/server/csp/index.ts
index 78e943ebf772c..6ba306596d27b 100644
--- a/src/legacy/server/csp/index.ts
+++ b/src/legacy/server/csp/index.ts
@@ -22,11 +22,7 @@ import { promisify } from 'util';
 
 const randomBytesAsync = promisify(randomBytes);
 
-export const DEFAULT_CSP_RULES = Object.freeze([
-  `script-src 'unsafe-eval' 'nonce-{nonce}'`,
-  'worker-src blob:',
-  'child-src blob:',
-]);
+export const DEFAULT_CSP_RULES = Object.freeze([]);
 
 export async function generateCSPNonce() {
   return (await randomBytesAsync(12)).toString('base64');
diff --git a/x-pack/legacy/plugins/maps/public/components/map/mb/utils.js b/x-pack/legacy/plugins/maps/public/components/map/mb/utils.js
index 24d8c5272b21c..e76066ba16701 100644
--- a/x-pack/legacy/plugins/maps/public/components/map/mb/utils.js
+++ b/x-pack/legacy/plugins/maps/public/components/map/mb/utils.js
@@ -5,10 +5,13 @@
  */
 
 import _ from 'lodash';
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
+import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
 import chrome from 'ui/chrome';
 import { MAKI_SPRITE_PATH } from '../../../../common/constants';
 
+mapboxgl.workerUrl = mbWorkerUrl;
+
 function relativeToAbsolute(url) {
   const a = document.createElement('a');
   a.setAttribute('href', url);