[Maps] Test worker loading

src/dev/build/tasks/nodejs_modules/clean_client_modules_on_dll_task.js

@@ -66,10 +66,38 @@ export const CleanClientModulesOnDLLTask = {
     // side code entries that were provided
     const serverDependencies = await getDependencies(baseDir, serverEntries);
 
+    // This fulfill a particular exceptional case where
+    // we need to keep loading a file from a node_module
+    // only used in the front-end like we do when using the file-loader
+    // in https://github.com/elastic/kibana/blob/master/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
+    //
+    // manual list of exception modules
+    const manualExceptionModules = [
+      'mapbox-gl'
+    ];
+
+    // consider the top modules as exceptions as the entry points
+    // to look for other exceptions dependent on that one
+    const manualExceptionEntries = [
+      ...manualExceptionModules.map(module => `${baseDir}/node_modules/${module}`)
+    ];
+
+    // dependencies for declared exception modules
+    const manualExceptionModulesDependencies = await getDependencies(baseDir, [
+      ...manualExceptionEntries
+    ]);
+
+    // final list of manual exceptions to add
+    const manualExceptions = [
+      ...manualExceptionModules,
+      ...manualExceptionModulesDependencies
+    ];
+
     // Consider this as our whiteList for the modules we can't delete
     const whiteListedModules = [
       ...serverDependencies,
-      ...kbnWebpackLoaders
+      ...kbnWebpackLoaders,
+      ...manualExceptions
     ];
 
     // Resolve the client vendors dll manifest path

src/legacy/server/csp/index.test.ts

@@ -40,8 +40,6 @@ test('default CSP rules', () => {
   expect(DEFAULT_CSP_RULES).toMatchInlineSnapshot(`
     Array [
       "script-src 'unsafe-eval' 'self'",
-      "worker-src blob:",
-      "child-src blob:",
       "style-src 'unsafe-inline' 'self'",
     ]
   `);

src/legacy/server/csp/index.ts

@@ -19,8 +19,6 @@
 
 export const DEFAULT_CSP_RULES = Object.freeze([
   `script-src 'unsafe-eval' 'self'`,
-  'worker-src blob:',
-  'child-src blob:',
   `style-src 'unsafe-inline' 'self'`,
 ]);
 

test/api_integration/apis/general/csp.js

@@ -37,8 +37,6 @@ export default function ({ getService }) {
       const entries = Array.from(parsed.entries());
       expect(entries).to.eql([
         [ 'script-src', [ '\'unsafe-eval\'', '\'self\'' ] ],
-        [ 'worker-src', [ 'blob:' ] ],
-        [ 'child-src', [ 'blob:' ] ],
         [ 'style-src', [ '\'unsafe-inline\'', '\'self\'' ] ]
       ]);
     });

x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js

@@ -13,15 +13,21 @@ import {
   addSpritesheetToMap,
 } from './utils';
 import { getGlyphUrl, isRetina } from '../../../meta';
-import { DECIMAL_DEGREES_PRECISION, ZOOM_PRECISION } from '../../../../common/constants';
-import mapboxgl from 'mapbox-gl';
+import {
+  DECIMAL_DEGREES_PRECISION,
+  ZOOM_PRECISION,
+} from '../../../../common/constants';
+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 { spritesheet } from '@elastic/maki';
 import sprites1 from '@elastic/maki/dist/sprite@1.png';
 import sprites2 from '@elastic/maki/dist/sprite@2.png';
 import { DrawControl } from './draw_control';
 import { TooltipControl } from './tooltip_control';
 
+mapboxgl.workerUrl = mbWorkerUrl;
+
 export class MBMapContainer extends React.Component {
   state = {
     prevLayerList: undefined,